执法登记补充所属区域字段

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -1,6 +1,7 @@
 package com.zdxt.app.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.PostBean;
 import com.zdxt.auth.dto.UserBean;
@@ -73,6 +74,7 @@ public class AppSystemController extends BaseController {
         DeptBean dept = deptApi.getDeptById(user.getDeptId());
         user.setDept(dept);
         user.setBureauDept(dept1);
+
         return ZDResponse.success("查询成功",user);
     }
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java

@@ -248,6 +248,21 @@ public class DeptApiImpl implements DeptApi {
         return iterationDeptParent(dept.getParentId());
     }
 
+    @Override
+    public DeptBean iterationDeptParentRegion(String deptId) {
+        DeptApi deptApi = SpringUtil.getBean(DeptApi.class);
+        DeptBean dept = deptApi.getDeptById(deptId);
+        Optional op =Optional.ofNullable(dept);
+        if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环
+        if (StringUtils.isNotEmpty(dept.getDeptType())) {
+            String type=dept.getDeptType().toLowerCase();
+            if(type.indexOf("region")!=-1 ){
+                return dept;
+            }
+        }
+        return iterationDeptParentRegion(dept.getParentId());
+    }
+
     @Override
     public DeptBean selectDeptByCreditcode(String code) {
         Dept dept = deptMapper.selectDeptByCreditcode(code);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java

@@ -168,11 +168,12 @@ public class DeptController extends BaseController {
     @ResponseBody
     public AjaxResult editSave(@Validated Dept dept)
     {
-        if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
-            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if(dept.getParentId().equals(dept.getDeptId()))
+//        if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+//        {
+//            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+//        }
+//        else
+        if(dept.getParentId().equals(dept.getDeptId()))
         {
             return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -183,6 +183,15 @@ public class EnforcementRegistration extends BaseDomain
     /** 是否牵头单位 */
     private int uniteType;
 
+    /**
+     * 所属区域
+     */
+    private String region;
+    /**
+     * 所属区域ID
+     */
+    private String regionId;
+
 
     public String getDeptQx() {
         return deptQx;
@@ -730,4 +739,20 @@ public class EnforcementRegistration extends BaseDomain
     public void setEndEnforcementTime(String endEnforcementTime) {
         this.endEnforcementTime = endEnforcementTime;
     }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(String regionId) {
+        this.regionId = regionId;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -13,8 +13,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.dto.ZdxtFileBean;
+import com.zdxt.auth.feign.DeptApi;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
 import com.zdxt.auth.project.system.dept.service.IDeptService;
@@ -77,6 +79,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     @Autowired
     private EnterpriseLawEnforcementMapper enterpriseLawEnforcementMapper;
 
+    @Autowired
+    private DeptApi deptApi;
+
 
     @Autowired
     private ILawEnforcementWarningListService lawEnforcementWarningListService;
@@ -304,6 +309,14 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
 //            enforcementRegistration.setStatus(0);
         resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration);
 
+        if(StrUtil.isNotEmpty(enforcementRegistration.getBureauDeptId())){
+            //查询人员所在区
+            DeptBean deptBean = deptApi.iterationDeptParentRegion(enforcementRegistration.getBureauDeptId());
+            //存储数据产生的所在行政区
+            enforcementRegistration.setRegion(deptBean.getDeptName());
+            enforcementRegistration.setRegionId(deptBean.getDeptId());
+        }
+
         // 重新加入附件
         if (resNum > 0 && enforcementRegistration.getFileList().size() > 0) {
             zdxtFileCommonApi.deleteZdxtFileByIds(enforcementRegistration.getId());

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java

@@ -112,12 +112,19 @@ public interface DeptApi {
     List<DeptBean> listDeptAppNoPermission(DeptBean dept);
 
     /**
-     * 查询当前人部门所在部门
+     * 查询当前人部门所在部门的局级部门
      * @param deptId
      * @return
      */
     DeptBean iterationDeptParent(String deptId);
 
+    /**
+     * 查询当前人所在区
+     * @param deptId
+     * @return
+     */
+    DeptBean iterationDeptParentRegion(String deptId);
+
     /**
      * 通过统一信用代码查询部门信息
      * @param code