From 7edb9aa08474df6854bfc2ffdc20af87eb073f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 4 Mar 2020 16:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=20=20=20?=
 =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8F=98=E6=88=90=E4=B8=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consult/service/impl/GridOperatorInfoServiceImpl.java   | 6 ++++--
 .../main/resources/mapper/consult/GridOperatorInfoDao.xml   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
index 44522a445..3d1853fcc 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java
+++ b/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;
     }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml
index c6872c835..b82b9ee24 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml
+++ b/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>