JiangPengLi 3 сар өмнө
parent
commit
d4b40795a3

+ 9 - 1
projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/mapper/SecUserAuthMapper.xml

@@ -7,7 +7,15 @@
         id, user_id, subject_id, create_time, cat, create_user_id, last_update_user_id, last_update_time, logic_delete_flag, remark
     </sql>
     <select id="findSubjectAuthIdsByUserId" resultType="java.lang.String">
-        select subject_id from sec_user_auth where user_id = #{userId} and logic_delete_flag = 0
+        SELECT
+            a.subject_id
+        FROM
+            sec_user u,
+            sec_user_auth a
+        WHERE
+            a.logic_delete_flag = 0
+          AND u.id = a.user_id
+          AND u.id = #{userId}
     </select>
 
 

+ 1 - 1
projects/src/main/java/com/rtrh/projects/web/controller/BaseController.java

@@ -48,7 +48,7 @@ public abstract class BaseController {
 	// 区域数据权限
 	public List<String> getSubjectIds() {
 		TeamShiroUser principal = (TeamShiroUser)SecurityUtils.getSubject().getPrincipal();
-		return "1".equals(principal.getStatusSubject()) ? secUserAuthService.findSubjectAuthIdsByUserId(principal.getId()) : null;
+		return secUserAuthService.findSubjectAuthIdsByUserId(principal.getId());
 	}
 	
 	@ModelAttribute