Merge branch 'feature/dangjian'

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptTreeDTO.java

@@ -19,5 +19,7 @@ public class DeptTreeDTO implements Serializable {
 
     private String name;
 
+    private int sort;
+
 
 }

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

@@ -58,8 +58,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -129,8 +127,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    private static final Logger logger = LoggerFactory.getLogger(SysDeptServiceImpl.class);
-
     @Override
     public List<SysDeptDTO> list(Map<String, Object> params) {
         //普通管理员，只能查询所属部门及子部门的数据
@@ -289,6 +285,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 
         // 发送消息
         this.baseDao.updateById(entity);
+        //更新redis
+        packgeAllDeptOption();
         //查询字典获取customer_id
         SysDictEntity sysDictEntity = sysDictDao.selectDcp();
         if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
@@ -1051,6 +1049,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 node = new JSONObject();
                 node.put("value", deptItemDto.getId());
                 node.put("label", deptItemDto.getName());
+                node.put("sort", deptItemDto.getSort());
                 headNodes.add(node);
             }
         }
@@ -1074,11 +1073,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                         childNode = new JSONObject();
                         childNode.put("value", categoryTreeDto.getId());
                         childNode.put("label", categoryTreeDto.getName());
+                        childNode.put("sort", categoryTreeDto.getSort());
                         children.add(childNode);
                         allChildren.add(childNode);
                     }
                 }
                 if (!children.isEmpty()) {
+                    children.sort(Comparator.comparing(obj -> ((JSONObject) obj).getString("sort")).reversed().reversed());
                     node.put("children", children);
                 }
             }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -277,7 +277,8 @@
         SELECT
             sd.id,
             sd.pid,
-            sd.`name`
+            sd.`name`,
+            sd.sort
         FROM
             sys_dept sd
             where sd.del_flag='0'

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java

@@ -168,7 +168,6 @@ public class GridForceInfoServiceImpl extends BaseServiceImpl<GridForceInfoDao,
             Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(formDto.getDeptId()));
             if (null != parentResult) {
                 formDto.setParentDeptIds(parentResult.getData().getParentDeptIds());
-                formDto.setDeptId(null);
             }
         }
         List<GridForceListResultDTO> list = baseDao.selectListGridForce(formDto);