提交查询部门接口无权限接口

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

@@ -355,12 +355,14 @@ public class AppEnforcementRegistrationController extends BaseController
     public ZDResponse getByIdToDataFillIn(@PathVariable String id)
     {
         EnforcementRegistration registration = enforcementRegistrationService.getEnforcementRegistrationById(id);
-        Map<String, Object> params = new HashMap<>();
+
-        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
+        //TODO 执法事项修改为手动输入
-        params.put("lawEnforcementItemText", tmp.getTitle());
+//        Map<String, Object> params = new HashMap<>();
-        tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis());
+//        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementItem());
-        params.put("lawEnforcementBasisText", tmp.getTitle());
+//        params.put("lawEnforcementItemText", tmp.getTitle());
-        registration.setParams(params);
+//        tmp = iLinkageDictService.selectLinkageDictById(registration.getLawEnforcementBasis());
+//        params.put("lawEnforcementBasisText", tmp.getTitle());
+//        registration.setParams(params);
         return ZDResponse.success("查询成功", registration);
     }
 }

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

@@ -337,12 +337,13 @@ public class AppEnterpriseLawEnforcementController extends BaseController
             }
         }
 
-        Map<String, Object> params = new HashMap<>();
+        //TODO 执法事项修改为手动输入
-        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
+//        Map<String, Object> params = new HashMap<>();
-        params.put("checkItemText", null==tmp?enfrorcement.getCheckItemText():tmp.getTitle());
+//        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
-        tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire());
+//        params.put("checkItemText", null==tmp?enfrorcement.getCheckItemText():tmp.getTitle());
-        params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle());
+//        tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire());
-        enfrorcement.setParams(params);
+//        params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle());
+//        enfrorcement.setParams(params);
         enfrorcement.setDeptObjs(objs);
 
         // 执法人员需要展示用户名+执法码

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

@@ -134,6 +134,13 @@ public class AppSystemController extends BaseController {
         return ZDResponse.success("查询成功",list);
     }
 
+    @GetMapping("/listDeptAppNoPermission")
+    @ResponseBody
+    public ZDResponse listDeptAppNoPermission(DeptBean dept) {
+        List<DeptBean> list = deptApi.listDeptAppNoPermission(dept);
+        return ZDResponse.success("查询成功",list);
+    }
+
     /**
      * 根据根据部门的parentId获取上一个parentId
      * @param dept

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

@@ -218,6 +218,20 @@ public class DeptApiImpl implements DeptApi {
         return deptBeans;
     }
 
+    @Override
+    public List<DeptBean> listDeptAppNoPermission(DeptBean bean) {
+        Dept params = new Dept();
+        BeanUtil.copyProperties(bean, params);
+        List<Dept> deptList = deptMapper.selectDeptList(params);
+        List<DeptBean> deptBeans = new ArrayList<>();
+        for (Dept source:deptList) {
+            DeptBean deptBean = new DeptBean();
+            BeanUtil.copyProperties(source, deptBean);
+            deptBeans.add(deptBean);
+        }
+        return deptBeans;
+    }
+
 
     // 递归获取部门
     public DeptBean iterationDeptParent(String deptId) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java

@@ -178,12 +178,14 @@ public class EnterpriseLawEnforcementController extends BaseController
     public ZDResponse getByIdToDataFillIn(@PathVariable String id)
     {
         EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id);
-        Map<String, Object> params = new HashMap<>();
+
-        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
+        //TODO 执法事项修改为手动输入
-        params.put("checkItemText", tmp.getTitle());
+//        Map<String, Object> params = new HashMap<>();
-        tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire());
+//        LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem());
-        params.put("checkRequireText", tmp.getTitle());
+//        params.put("checkItemText", tmp.getTitle());
-        enfrorcement.setParams(params);
+//        tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire());
+//        params.put("checkRequireText", tmp.getTitle());
+//        enfrorcement.setParams(params);
         return ZDResponse.success("查询成功", enfrorcement);
     }
 }

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/DeptBean.java

@@ -1,12 +1,8 @@
 package com.zdxt.auth.dto;
 
+import com.zdxt.common.BaseDomain;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
 
 /**
  * 部门-JavaBean
@@ -15,7 +11,7 @@ import java.util.Map;
  * @date: 2020/4/10 15:43
  */
 @ApiModel
-public class DeptBean implements Serializable {
+public class DeptBean extends BaseDomain {
 
     private static final long serialVersionUID = -5247334811920458179L;
 
@@ -115,41 +111,11 @@ public class DeptBean implements Serializable {
      */
     private String searchValue;
 
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
     /**
      * 部门类型 0 机构 1 部门 2 小组
      */
     private String deptType;
 
-    /**
-     * 请求参数
-     */
-    private Map<String, Object> params;
 
     public String getDeptId() {
         return deptId;
@@ -247,53 +213,7 @@ public class DeptBean implements Serializable {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
 
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Map<String, Object> getParams() {
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params) {
-        this.params = params;
-    }
 
     public String getOrganization() {
         return organization;
@@ -334,12 +254,6 @@ public class DeptBean implements Serializable {
                 ", delFlag='" + delFlag + '\'' +
                 ", parentName='" + parentName + '\'' +
                 ", searchValue='" + searchValue + '\'' +
-                ", createBy='" + createBy + '\'' +
-                ", createTime=" + createTime +
-                ", updateBy='" + updateBy + '\'' +
-                ", updateTime=" + updateTime +
-                ", remark='" + remark + '\'' +
-                ", params=" + params +
                 '}';
     }
 }

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

@@ -107,6 +107,10 @@ public interface DeptApi {
     @ApiOperation("根据父节点获取其下所有部门信息")
     public List<DeptBean> selectDeptByParentId(DeptBean dept);
 
+    @PostMapping("/selectDeptByParentIdNoPermission")
+    @ApiOperation("根据父节点获取其下所有部门信息无权限")
+    public List<DeptBean> listDeptAppNoPermission(DeptBean dept);
+
     /**
      * 查询当前人部门所在部门
      * @param deptId