From 81747291bf4504afcd848758ab3451d3f29ad3ef Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 30 Aug 2023 15:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=A8=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/sys_role/service/repo_sys_role.go | 33 ++++++++-------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/features/sys_role/service/repo_sys_role.go b/features/sys_role/service/repo_sys_role.go index 3aa66407..17ad309d 100644 --- a/features/sys_role/service/repo_sys_role.go +++ b/features/sys_role/service/repo_sys_role.go @@ -9,7 +9,7 @@ import ( "ems.agt/lib/core/datasource" "ems.agt/lib/core/utils/date" "ems.agt/lib/core/utils/parse" - "github.com/go-admin-team/go-admin-core/logger" + "ems.agt/lib/log" ) // 实例化数据层 RepoSysRole 结构体 @@ -19,8 +19,7 @@ var NewRepoSysRole = &RepoSysRole{ r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id`, + left join user u on u.id = ur.user_id`, resultMap: map[string]string{ "role_id": "RoleID", @@ -101,13 +100,6 @@ func (r *RepoSysRole) SelectRolePage(query map[string]any) map[string]any { endDate := date.ParseStrToDate(endTime.(string), date.YYYY_MM_DD) params = append(params, endDate.UnixMilli()) } - if v, ok := query["deptId"]; ok && v != "" { - conditions = append(conditions, `(u.dept_id = ? or u.dept_id in ( - select t.dept_id from sys_dept t where find_in_set(?, ancestors) - ))`) - params = append(params, v) - params = append(params, v) - } // 构建查询条件语句 whereSql := " where r.del_flag = '0' " @@ -118,11 +110,10 @@ func (r *RepoSysRole) SelectRolePage(query map[string]any) map[string]any { // 查询数量 长度为0直接返回 totalSql := `select count(distinct r.role_id) as 'total' from sys_role r left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id` + left join user u on u.id = ur.user_id` totalRows, err := datasource.RawDB("", totalSql+whereSql, params) if err != nil { - logger.Errorf("total err => %v", err) + log.Errorf("total err => %v", err) } total := parse.Number(totalRows[0]["total"]) if total == 0 { @@ -142,7 +133,7 @@ func (r *RepoSysRole) SelectRolePage(query map[string]any) map[string]any { querySql := r.selectSql + whereSql + pageSql results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) } // 转换实体 @@ -186,7 +177,7 @@ func (r *RepoSysRole) SelectRoleList(sysRole model.SysRole) []model.SysRole { querySql := r.selectSql + whereSql + orderSql rows, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysRole{} } return r.convertResultRows(rows) @@ -197,7 +188,7 @@ func (r *RepoSysRole) SelectRoleListByUserId(userId string) []model.SysRole { querySql := r.selectSql + " where r.del_flag = '0' and ur.user_id = ?" results, err := datasource.RawDB("", querySql, []any{userId}) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysRole{} } return r.convertResultRows(results) @@ -210,7 +201,7 @@ func (r *RepoSysRole) SelectRoleByIds(roleIds []string) []model.SysRole { parameters := datasource.ConvertIdsSlice(roleIds) results, err := datasource.RawDB("", querySql, parameters) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysRole{} } // 转换实体 @@ -255,7 +246,7 @@ func (r *RepoSysRole) UpdateRole(sysRole model.SysRole) int64 { values = append(values, sysRole.RoleID) rows, err := datasource.ExecDB("", sql, values) if err != nil { - logger.Errorf("update row : %v", err.Error()) + log.Errorf("update row : %v", err.Error()) return 0 } return rows @@ -301,7 +292,7 @@ func (r *RepoSysRole) InsertRole(sysRole model.SysRole) string { // 执行插入 rows, err := datasource.ExecDB("", sql, values) if err != nil { - logger.Errorf("insert row : %v", err.Error()) + log.Errorf("insert row : %v", err.Error()) return "" } @@ -315,7 +306,7 @@ func (r *RepoSysRole) DeleteRoleByIds(roleIds []string) int64 { parameters := datasource.ConvertIdsSlice(roleIds) results, err := datasource.ExecDB("", sql, parameters) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -347,7 +338,7 @@ func (r *RepoSysRole) CheckUniqueRole(sysRole model.SysRole) string { querySql := "select role_id as 'str' from sys_role r " + whereSql + " and r.del_flag = '0' limit 1" results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err %v", err) + log.Errorf("query err %v", err) return "" } if len(results) > 0 {