fix

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

@@ -372,6 +372,8 @@ public class CzrkServiceImpl implements ICzrkService {
         if (isEmpty(czrkJzdzList)) return AjaxResult.error("该人员常住地址未添加");
         //一开始就判断是否是户籍和所有居住地址是否都不在权限之下
         if (setInsertRole(czrk, sysUser)) {
+            log.info("{}于{}新增户籍人口失败户籍地址和居住地址均不属于权限范围：{}"
+                    , sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
             return AjaxResult.error(HttpStatus.NOT_IMPLEMENTED, "当前填写的户籍地址和居住地址均不属于权限范围");
         }
         String houseType = czrk.getHouseType();
@@ -842,8 +844,6 @@ public class CzrkServiceImpl implements ICzrkService {
         wrl = czrkMapper.stsByWrl(czrk);
         //设置查询权限
         setQueryRole(czrk, sysUser, queryType);
-        //拆分搜索接口中年龄字段
-        setAgeScope(czrk);
         if (Czrk.HJ.equals(queryType)) {
             //获取到居住地的查询条件
             String provinceId = czrk.getProvinceIdXjd();

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -123,8 +123,8 @@ public class CzrkUtils {
      * @param sysUser
      */
     public static Boolean setInsertRole(Czrk czrk, SysUser sysUser) {
-        Boolean flag = false;
-        //todo 从部门中获取行政区域规划id
+        boolean flag = true;
+        //从部门中获取行政区域规划id
         SysDept dept = sysUser.getDept();
         if (dept == null){
             throw new BaseException("对不起，未获相关部门信息");
@@ -144,28 +144,30 @@ public class CzrkUtils {
                             case "province":
                                 String provinceId = czrk.getProvinceId();
                                 if (StringUtils.isNotBlank(provinceId) && provinceId.equals(areaId)){
-                                     flag = true;
+                                    return flag = false;
                                 }
                             case "city":
                                 String cityId = czrk.getCityId();
                                 if (StringUtils.isNotBlank(cityId) && cityId.equals(areaId)){
-                                    flag = true;
+                                    return  flag = false;
                                 }
                             case "region":
                                 String regionId = czrk.getRegionId();
                                 if (StringUtils.isNotBlank(regionId) && regionId.equals(areaId)){
-                                    flag = true;
+                                    return  flag = false;
                                 }
                             case "villageTowns":
                                 String villageTownsId = czrk.getVillageTownsId();
                                 if (StringUtils.isNotBlank(villageTownsId) && villageTownsId.equals(areaId)){
-                                    flag = true;
+                                    return flag = false;
                                 }
                             case "village":
                                 String village = czrk.getVillage();
                                 if (StringUtils.isNotBlank(village) && village.equals(areaId)){
-                                    flag = true;
+                                    return flag = false;
                                 }
+                            case "admin":
+                                return flag = false;
                             default:
                         }
                     }