public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-25 14:38:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix]异常处理

Browse Source
This commit is contained in:
panda
2024-06-06 20:46:35 +08:00
parent 41b61ebf1e
commit 4cee5ae537
24 changed files with 801 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/system/api/organization.go
View File

@@ -21,11 +21,12 @@ type OrganizationApi struct {
func (m *OrganizationApi) GetOrganizationTreeRoleSelect(rc *restfulx.ReqCtx) {
roleId := restfulx.PathParamInt(rc, "roleId")
var organization entity.SysOrganization
result := m.OrganizationApp.SelectOrganizationLable(organization)
result, err := m.OrganizationApp.SelectOrganizationLable(organization)
biz.ErrIsNil(err, "查询组织树失败")
organizationIds := make([]int64, 0)
if roleId != 0 {
organizationIds = m.RoleApp.GetRoleOrganizationId(entity.SysRole{RoleId: int64(roleId)})
organizationIds, err = m.RoleApp.GetRoleOrganizationId(entity.SysRole{RoleId: int64(roleId)})
biz.ErrIsNil(err, "查询角色组织失败")
}
rc.ResData = vo.OrganizationTreeVo{
Organizations: result,
@@ -34,24 +35,27 @@ func (m *OrganizationApi) GetOrganizationTreeRoleSelect(rc *restfulx.ReqCtx) {
}
func (a *OrganizationApi) GetOrganizationList(rc *restfulx.ReqCtx) {
//pageNum := restfulx.QueryInt(rc.GinCtx, "pageNum", 1)
//pageSize := restfulx.QueryInt(rc.GinCtx, "pageSize", 10)
organizationName := restfulx.QueryParam(rc, "organizationName")
status := restfulx.QueryParam(rc, "status")
organizationId := restfulx.QueryInt(rc, "organizationId", 0)
organization := entity.SysOrganization{OrganizationName: organizationName, Status: status, OrganizationId: int64(organizationId)}
if organization.OrganizationName == "" {
rc.ResData = a.OrganizationApp.SelectOrganization(organization)
data, err := a.OrganizationApp.SelectOrganization(organization)
biz.ErrIsNil(err, "查询组织树失败")
rc.ResData = data
} else {
rc.ResData = a.OrganizationApp.FindList(organization)
data, err := a.OrganizationApp.FindList(organization)
biz.ErrIsNil(err, "查询组织列表失败")
rc.ResData = data
}
}
func (a *OrganizationApi) GetOrdinaryOrganizationList(rc *restfulx.ReqCtx) {
var organization entity.SysOrganization
rc.ResData = a.OrganizationApp.FindList(organization)
data, err := a.OrganizationApp.FindList(organization)
biz.ErrIsNil(err, "查询组织列表失败")
rc.ResData = data
}
func (a *OrganizationApi) GetOrganizationTree(rc *restfulx.ReqCtx) {
@@ -60,19 +64,24 @@ func (a *OrganizationApi) GetOrganizationTree(rc *restfulx.ReqCtx) {
organizationId := restfulx.QueryInt(rc, "organizationId", 0)
organization := entity.SysOrganization{OrganizationName: organizationName, Status: status, OrganizationId: int64(organizationId)}
rc.ResData = a.OrganizationApp.SelectOrganization(organization)
data, err := a.OrganizationApp.SelectOrganization(organization)
biz.ErrIsNil(err, "查询组织树失败")
rc.ResData = data
}
func (a *OrganizationApi) GetOrganization(rc *restfulx.ReqCtx) {
organizationId := restfulx.PathParamInt(rc, "organizationId")
rc.ResData = a.OrganizationApp.FindOne(int64(organizationId))
data, err := a.OrganizationApp.FindOne(int64(organizationId))
biz.ErrIsNil(err, "查询组织失败")
rc.ResData = data
}
func (a *OrganizationApi) InsertOrganization(rc *restfulx.ReqCtx) {
var organization entity.SysOrganization
restfulx.BindJsonAndValid(rc, &organization)
organization.CreateBy = rc.LoginAccount.UserName
a.OrganizationApp.Insert(organization)
_, err := a.OrganizationApp.Insert(organization)
biz.ErrIsNil(err, "添加组织失败")
}
func (a *OrganizationApi) UpdateOrganization(rc *restfulx.ReqCtx) {
@@ -80,7 +89,8 @@ func (a *OrganizationApi) UpdateOrganization(rc *restfulx.ReqCtx) {
restfulx.BindJsonAndValid(rc, &organization)
organization.UpdateBy = rc.LoginAccount.UserName
a.OrganizationApp.Update(organization)
err := a.OrganizationApp.Update(organization)
biz.ErrIsNil(err, "修改组织失败")
}
func (a *OrganizationApi) DeleteOrganization(rc *restfulx.ReqCtx) {
@@ -91,7 +101,10 @@ func (a *OrganizationApi) DeleteOrganization(rc *restfulx.ReqCtx) {
for _, id := range organizationIds {
user := entity.SysUser{}
user.OrganizationId = id
list := a.UserApp.FindList(user)
list, err := a.UserApp.FindList(user)
if err != nil {
continue
}
if len(*list) == 0 {
deList = append(deList, id)
} else {