Merge remote-tracking branch 'origin/master' into feature/syp_screenDataPush

# Conflicts:
#	esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -926,7 +926,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public void packageKcDeptCodeOption() {
         DeptCodeFormDTO deptCodeFormDTO = new DeptCodeFormDTO();
-        deptCodeFormDTO.setRootAreaCode(EpmetConstant.DEPT_CODE_KCZ);
+        deptCodeFormDTO.setRootAreaCode(EpmetConstant.DEPT_CODE_PY);
+        deptCodeFormDTO.setRootAreaLevel(EpmetConstant.DEPT_CODE_LEVEL_PY);
         Result<DeptCodeOption> deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO);
         if(deptCodeResult.getData()!=null){
             DeptCodeOption deptCodeOption = deptCodeResult.getData();

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java

@@ -175,9 +175,13 @@ public interface EpmetConstant {
 
 
      /**
-     * 行政地区编码查询 - 锦水街道
+     * 行政地区编码查询 - 平阴县
      */
-    String DEPT_CODE_KCZ = "370124";
+    String DEPT_CODE_PY = "370124";
+     /**
+     * 行政地区编码查询 - 省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community
+     */
+    String DEPT_CODE_LEVEL_PY = "district";
 
 
     /**

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java

@@ -17,6 +17,11 @@ public class DeptCodeFormDTO implements Serializable {
      */
     private String rootAreaCode;
 
+    /**
+     * 部门区域级别
+     */
+    private String rootAreaLevel;
+
 
 
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml

@@ -73,7 +73,7 @@
             CONCAT(PIDS,',',ID)
         from epdc_module_category
         where CATEGORY_CODE = #{noticeCategoryCode} and DEL_FLAG = '0' limit 1
-    </select>
+     </select>
     <select id="getModuleCategoryCodesHierarchy" resultType="java.lang.String">
         select
             CATEGORY_CODE