部门用户

@@ -14,14 +14,19 @@ info(
     jwt: SystemAuth
     jwt: SystemAuth
 )
 )
 service Core {
 service Core {
+    @doc "角色详情"
     @handler systemGetRole
     @handler systemGetRole
     get /system/role/:id (RoleGetRequest) returns (RoleGetResponse)
     get /system/role/:id (RoleGetRequest) returns (RoleGetResponse)
+    @doc "角色新增"
     @handler systemSaveRole
     @handler systemSaveRole
     post /system/role (RoleSaveRequest) returns (RoleSaveResponse)
     post /system/role (RoleSaveRequest) returns (RoleSaveResponse)
+    @doc "角色删除"
     @handler systemDeleteRole
     @handler systemDeleteRole
     delete /system/role/:id (RoleDeleteRequest) returns (RoleDeleteResponse)
     delete /system/role/:id (RoleDeleteRequest) returns (RoleDeleteResponse)
+    @doc "角色更新"
     @handler systemUpdateRole
     @handler systemUpdateRole
     put /system/role/:id (RoleUpdateRequest) returns (RoleUpdateResponse)
     put /system/role/:id (RoleUpdateRequest) returns (RoleUpdateResponse)
+    @doc "角色列表搜索"
     @handler systemSearchRole
     @handler systemSearchRole
     post /system/role/search (RoleSearchRequest) returns (RoleSearchResponse)
     post /system/role/search (RoleSearchRequest) returns (RoleSearchResponse)
 }
 }

@@ -33,9 +33,10 @@ func (l *MiniUserDepartmentUsersLogic) MiniUserDepartmentUsers(req *types.MiniUs
 		userToken   = contextdata.GetUserTokenFromCtx(l.ctx)
 		userToken   = contextdata.GetUserTokenFromCtx(l.ctx)
 		users       []*domain.User
 		users       []*domain.User
 		departments []*domain.Department
 		departments []*domain.Department
+		groups      = make([]DepartmentUser, 0)
 	)
 	)
 	resp = map[string]interface{}{
 	resp = map[string]interface{}{
-		"list": make([]DepartmentUser, 0),
+		"list": groups,
 	}
 	}
 	_, departments, err = l.svcCtx.DepartmentRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithFindOnly())
 	_, departments, err = l.svcCtx.DepartmentRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().WithFindOnly())
 	if err != nil {
 	if err != nil {
@@ -58,13 +59,17 @@ func (l *MiniUserDepartmentUsersLogic) MiniUserDepartmentUsers(req *types.MiniUs
 			}
 			}
 			if lo.Contains(user.Departments, item.Id) && !groupUserSet.Contains(user.Id) {
 			if lo.Contains(user.Departments, item.Id) && !groupUserSet.Contains(user.Id) {
 				group.Users = append(group.Users, &domain.User{
 				group.Users = append(group.Users, &domain.User{
-					Id:   user.Id,
-					Name: user.Name,
+					Id:         user.Id,
+					Name:       user.Name,
+					PinYinName: user.PinYinName,
 				})
 				})
 			}
 			}
 		}
 		}
+		groups = append(groups, group)
 	})
 	})
-
+	resp = map[string]interface{}{
+		"list": groups,
+	}
 	return
 	return
 }
 }
 
 

@@ -2,6 +2,7 @@ package user
 
 
 import (
 import (
 	"context"
 	"context"
+	"github.com/samber/lo"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/contextdata"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/contextdata"
@@ -33,6 +34,9 @@ func (l *SystemUserAccountEnableLogic) SystemUserAccountEnable(req *types.System
 		users     []*domain.User
 		users     []*domain.User
 		userToken = contextdata.GetUserTokenFromCtx(l.ctx)
 		userToken = contextdata.GetUserTokenFromCtx(l.ctx)
 	)
 	)
+	if !lo.Contains([]int{domain.UserEnable, domain.UserDisable}, req.Status) {
+		return nil, xerr.NewErrMsg("启用状态有误")
+	}
 	if _, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().MustWithKV("ids", req.UserIds).WithFindOnly()); err != nil {
 	if _, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, domain.IndexCompanyId(userToken.CompanyId)().MustWithKV("ids", req.UserIds).WithFindOnly()); err != nil {
 		return nil, xerr.NewErrMsgErr("公司不存在", err)
 		return nil, xerr.NewErrMsgErr("公司不存在", err)
 	}
 	}
@@ -50,5 +54,6 @@ func (l *SystemUserAccountEnableLogic) SystemUserAccountEnable(req *types.System
 	}, true); err != nil {
 	}, true); err != nil {
 		return nil, xerr.NewErrMsgErr("更新启用状态失败", err)
 		return nil, xerr.NewErrMsgErr("更新启用状态失败", err)
 	}
 	}
+	resp = &types.SystemUserAccountEnableResponse{}
 	return
 	return
 }
 }

@@ -211,8 +211,8 @@ func (repository *UserRepository) FindDepartmentUsers(ctx context.Context, conn
 		total int64
 		total int64
 	)
 	)
 	queryFunc := func() (interface{}, error) {
 	queryFunc := func() (interface{}, error) {
-		tx = tx.Model(&ms).Order("id desc")
-		tx.Select("id", "name", "departments")
+		tx = tx.Model(&ms).Order("pin_yin_name asc")
+		tx.Select("id", "name", "departments", "pin_yin_name")
 		tx.Where("company_id = ?", companyId)
 		tx.Where("company_id = ?", companyId)
 		tx.Where("audit_status in (?)", domain.UserAuditStatusPassed)
 		tx.Where("audit_status in (?)", domain.UserAuditStatusPassed)
 		tx.Where("enable = ?", domain.UserEnable)
 		tx.Where("enable = ?", domain.UserEnable)