SCRUM-3268

controllers/partial/SystemController.go

@@ -105,29 +105,13 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 	name := c.Ctx.DefaultQuery("name", "")
 	login_id := c.Ctx.DefaultQuery("login_id", "")
-	org_id := c.Ctx.DefaultQuery("org_id", "")
-	cn_org_id := c.Ctx.DefaultQuery("cn_org_id", "")
 
-	var roleRule interface{}
-	rule_code := "org_tree"
-	user_id := c.Ctx.GetString("user_id")
-	exist, _ := c.Db.Table("sys_user_role").Where("user_id = ? and role_id = ?", user_id, "5c38ee66-c5e6-40a7-b190-86d115bae3e5").Exist()
-	//如果是管理员
-	if exist {
-		user_id = ""
-		roleRule = ""
-	} else if rule_code != "" {
-		var roleRules []models.SysDataPermissionDetail
-		// 根据rule_code获取角色对应的接口规则
-		err := c.Db.SqlMapClient("get_user_rule_by_code", rule_code, user_id).Find(&roleRules)
-		if err != nil {
-			roleRule = ""
-		} else {
-			roleRule = sysutils.ParseRule(roleRules)
-		}
+	paramMap_i_t := map[string]interface{}{
+		"page": page, 
+		"rows": rows,
+		"name": name,
+		"login_id": login_id,  
 	}
-
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "name": name, "login_id": login_id, "org_id": org_id, "cn_org_id": cn_org_id, "user_id": user_id, "role_rule": roleRule}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_user_page", "sys_user", paramMap_i_t)
 
 	if err != nil {
@@ -289,8 +273,7 @@ func System_AddUser(c *entitys.CtrlContext) {
 	}
 
 	_, err = c.Db.Insert(&user)
-	ret := __none_func_system__(user.LoginId, user.Password, user.OrgId, user.Email)
-	if ret && err == nil {
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "域数据库插入用户错误:" + err.Error(), nil})

sqlconfig/system_controller/system_find_user_page_count.tpl

@@ -1,25 +1,11 @@
 
 select
-    count(*) records
-from
-    sys_user
-{{if or (ne .cn_org_id "") (ne .org_id "")}}
-left join
-    sys_org
-on
-    sys_user.org_id = sys_org.id
-{{end}}
-where
-	sys_user.del_flag = 0
+count(*) records
+from sys_user
+where sys_user.del_flag = 0
 {{if ne .name ""}}
-    and sys_user.name like '%{{.name}}%'
+ and sys_user.name like '%{{.name}}%'
 {{end}}
 {{if ne .login_id ""}}
-    and sys_user.login_id like '%{{.login_id}}%'
-{{end}}
-{{if ne .cn_org_id ""}}
-    and sys_org.inheritance like '%{{.cn_org_id}}%'
-{{end}}
-{{if ne .role_rule ""}}
-    and {{.role_rule}}
+ and sys_user.login_id like '%{{.login_id}}%'
 {{end}}

sqlconfig/system_controller/system_find_user_page_select.tpl

@@ -1,35 +1,29 @@
 
+
+
 select
-    sys_user.*,
-    sys_org.name org_name,
-    sys_org.id org_id,
-    IFNULL(GROUP_CONCAT(sys_role.name), '') role_name,
-    IFNULL(GROUP_CONCAT(sys_role.id), '') user_role
+sys_user.*,
+sys_org.name org_name,
+sys_org.id org_id,
+IFNULL(GROUP_CONCAT(distinct sys_role.name), '') role_name,
+IFNULL(GROUP_CONCAT(distinct sys_role.id), '') user_role
 from
-    sys_user
-left join
-    sys_org
-on
-    sys_user.org_id = sys_org.id
-left join
-    sys_user_role
-on sys_user_role.user_id = sys_user.id
-left join
-    sys_role
-on sys_role.id = sys_user_role.role_id
-where
-    sys_user.del_flag = 0
-{{if ne .name ""}}
-    and sys_user.name like '%{{.name}}%'
-{{end}}
-{{if ne .login_id ""}}
-    and sys_user.login_id like '%{{.login_id}}%'
-{{end}}
-{{if ne .cn_org_id ""}}
-    and sys_org.inheritance like '%{{.cn_org_id}}%'
-{{end}}
-{{if ne .role_rule ""}}
-    and {{.role_rule}}
-{{end}}
+(
+ select sys_user.id
+ from sys_user
+ where sys_user.del_flag = 0
+ {{if ne .name ""}}
+  and sys_user.name like '%{{.name}}%'
+ {{end}}
+ {{if ne .login_id ""}}
+  and sys_user.login_id like '%{{.login_id}}%'
+ {{end}}
+ order by sys_user.create_time desc
+ LIMIT {{.rows}} OFFSET {{.offset}}
+) a
+join sys_user on sys_user.id=a.id
+left join sys_org on sys_user.org_id = sys_org.id
+left join sys_user_role on sys_user_role.user_id = sys_user.id
+left join sys_role on sys_role.id = sys_user_role.role_id
 GROUP BY sys_user.id
-LIMIT {{.rows}} OFFSET {{.offset}}
+order by sys_user.create_time desc