OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

用户表关联角色

Browse Source
This commit is contained in:
TsMask
2023-08-30 15:47:28 +08:00
parent 775883d859
commit 81747291bf
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
features/sys_role/service/repo_sys_role.go
View File

@@ -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 {