fix

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -1306,7 +1306,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
         // 市领导
         List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
-        if (roleKeySets.contains("city") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
+        if (roleKeySets.contains("province") ||roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
             JSONObject jsonObject = redisService.getCacheObject(packRedisKey(deptId+""));
             if (isNotEmpty(jsonObject)) {
                 QIANSHANSHI_SINGEL = jsonObject;
@@ -1397,7 +1397,7 @@ public class CzrkServiceImpl implements ICzrkService {
             });
 
             return QIANSHANSHI_SINGEL;*/
-        } else if (roleKeySets.contains("sys:town")) {
+        } else if (roleKeySets.contains("villageTowns")) {
             JSONObject jsonObject = redisService.getCacheObject(packRedisKey("town:" + deptId));
             if (isNotEmpty(jsonObject)) {
                 return jsonObject;
@@ -1442,7 +1442,7 @@ public class CzrkServiceImpl implements ICzrkService {
         Long deptId = sysUser.getDeptId();
 
         // 市领导 todo 此处不应该写死
-        if (roleKeySets.contains("city") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
+        if (roleKeySets.contains("province") ||roleKeySets.contains("city") || roleKeySets.contains("region") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
             JSONObject jsonObject = redisService.getCacheObject(packRedisKey(deptId + ""));
             if (isNotEmpty(jsonObject)) {
                 QIANSHANSHI = jsonObject;
@@ -1577,7 +1577,7 @@ public class CzrkServiceImpl implements ICzrkService {
             });
 
             return QIANSHANSHI;
-        } else if (roleKeySets.contains("sys:town")) {
+        } else if (roleKeySets.contains("villageTowns")) {
             JSONObject jsonObject = redisService.getCacheObject(packRedisKey("town:" + deptId));
             if (isNotEmpty(jsonObject)) {
                 ZHEN = jsonObject;