修改数据权限变量

controllers/partial/SystemController.go

@@ -109,16 +109,17 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 	cn_org_id := c.Ctx.DefaultQuery("cn_org_id", "")
 
 	var roleRule interface{}
-	rule_code := "org_rule"
+	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", user_id).Find(&roleRules)
+		err := c.Db.SqlMapClient("get_user_rule_by_code", rule_code, user_id).Find(&roleRules)
 		if err != nil {
 			roleRule = ""
 		} else {
@@ -126,7 +127,7 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 		}
 	}
 
-	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, "role_rule": roleRule}
+	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 {
@@ -168,7 +169,7 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 // @Failure 403 :id is empty
 func System_GetOrgTree(c *entitys.CtrlContext) {
 	var roleRule interface{}
-	rule_code := "org_rule"
+	rule_code := "org_tree"
 	// 管理员角色ID 5c38ee66-c5e6-40a7-b190-86d115bae3e5,如果是管理员，可以看所有，否则只看到本部门
 	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()
@@ -178,7 +179,7 @@ func System_GetOrgTree(c *entitys.CtrlContext) {
 	} else if rule_code != "" {
 		var roleRules []models.SysDataPermissionDetail
 		// 根据rule_code获取角色对应的接口规则
-		err := c.Db.SqlMapClient("get_user_rule_by_code", user_id).Find(&roleRules)
+		err := c.Db.SqlMapClient("get_user_rule_by_code", rule_code, user_id).Find(&roleRules)
 		if err != nil {
 			roleRule = ""
 		} else {

sqlconfig/light-apiengine-develop/sys_data_permission.xml

@@ -7,6 +7,7 @@
         WHERE
             sys_data_permission.id = sys_data_permission_detail.data_permission_id
             AND sys_user_role.role_id = sys_data_permission_detail.role_id
+            AND sys_data_permission.code = ?
             AND sys_user_role.user_id = ?
     </sql>
 </sqlMap>