1

modules/base/service/base_sys_user.go

@@ -214,35 +214,38 @@ func NewBaseSysUserService() *BaseSysUserService {
 				"email": "邮箱不能重复",
 			},
 			PageQueryOp: &cool.QueryOp{
-				Select: "base_sys_user.*,dept.`name` as departmentName,GROUP_CONCAT( role.`name` ) AS `roleName`",
+				Select: ` 
+    base_sys_user.*,
+    dept.name AS departmentName,
+    STRING_AGG(role.name, ', ') AS roleName`,
 				Join: []*cool.JoinOp{
 					{
 						Model:     model.NewBaseSysDepartment(),
 						Alias:     "dept",
 						Type:      "LeftJoin",
-						Condition: "`base_sys_user`.`departmentId` = `dept`.`id`",
+						Condition: `base_sys_user."departmentId" = dept.id`,
 					},
 					{
 						Model:     model.NewBaseSysUserRole(),
 						Alias:     "user_role",
 						Type:      "LeftJoin",
-						Condition: "`base_sys_user`.`id` = `user_role`.`userId`",
+						Condition: `base_sys_user.id = user_role."userId"`,
 					},
 					{
 						Model:     model.NewBaseSysRole(),
-						Alias:     "`role`",
+						Alias:     "role",
 						Type:      "LeftJoin",
-						Condition: "`role`.`id` = `user_role`.`roleId`",
+						Condition: `role.id = user_role."roleId"`,
 					},
 				},
 				Where: func(ctx context.Context) []g.Array {
 					r := g.RequestFromCtx(ctx).GetMap()
 					return []g.Array{
-						{"(departmentId IN (?))", gconv.SliceStr(r["departmentIds"])},
+						{`("departmentId" IN (?))`, gconv.SliceStr(r["departmentIds"])},
 					}
 				},
 				Extend: func(ctx g.Ctx, m *gdb.Model) *gdb.Model {
-					return m.Group("`base_sys_user`.`id`")
+					return m.Group(`base_sys_user.id`)
 				},
 				KeyWordField: []string{"name", "username", "nickName"},
 			},