修改排序 级联变成三级

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

@@ -89,8 +89,10 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
         GridOperatorInfoEntity entity = baseDao.selectById(id);
         GridOperatorInfoDTO gridOperatorInfoDTO = ConvertUtils.sourceToTarget(entity, GridOperatorInfoDTO.class);
         if (StringUtils.isNotBlank(entity.getAllDeptIds())) {
-            String depts[] = entity.getAllDeptIds().split(",");
-            gridOperatorInfoDTO.setAllDeptIds(depts);
+            String[] depts = entity.getAllDeptIds().split(",");
+            List<String> ids = Arrays.asList(depts);
+            String[] allDeptIds = new String[(ids.subList(1, ids.size())).size()];
+            gridOperatorInfoDTO.setAllDeptIds((ids.subList(1, ids.size())).toArray(allDeptIds));
         }
         return gridOperatorInfoDTO;
     }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml

@@ -44,6 +44,7 @@
             OR find_in_set(#{gridId},ALL_DEPT_IDS))
         </if>
         ORDER BY
+        SORT ASC,
         CREATED_TIME DESC
     </select>
     <select id="selectListGridOperator" resultType="com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO">
@@ -61,6 +62,7 @@
         AND ei.DEPT_ID = #{deptId}
         AND ei.SHOW_FLAG = '1'
         ORDER BY
+        ei.SORT ASC,
         ei.CREATED_TIME DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>