From 8aba267e4f263d80c99cce02f7db295c50134533 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 20 Jul 2023 13:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC=E5=8A=9B?=
 =?UTF-8?q?=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/consult/GridForceInfoDTO.java      |  3 +--
 .../service/impl/GridForceInfoServiceImpl.java       | 12 +++++++++++-
 .../resources/mapper/consult/GridForceInfoDao.xml    |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
index 39e128bbb..90fd4737c 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
@@ -21,7 +21,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -151,6 +150,6 @@ public class GridForceInfoDTO implements Serializable {
     /**
      * 新增是，选择所属网格，多选
      */
-    private List<Long[]> selectedDeptIds;
+    private String[] selectedDeptIds;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
index 92ff5b957..cffead36d 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
@@ -84,7 +84,12 @@ public class GridForceInfoServiceImpl extends BaseServiceImpl<GridForceInfoDao,
     @Override
     public GridForceInfoDTO get(String id) {
         GridForceInfoEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, GridForceInfoDTO.class);
+        GridForceInfoDTO dto = ConvertUtils.sourceToTarget(entity, GridForceInfoDTO.class);
+        if(StringUtils.isNotEmpty(entity.getAllDeptIds())){
+            dto.setDeptId(String.valueOf(entity.getDeptId()));
+            dto.setSelectedDeptIds(entity.getAllDeptIds().split(","));
+        }
+        return dto;
     }
 
     @Override
@@ -126,6 +131,11 @@ public class GridForceInfoServiceImpl extends BaseServiceImpl<GridForceInfoDao,
     @Transactional(rollbackFor = Exception.class)
     public void update(GridForceInfoDTO dto) {
         GridForceInfoEntity entity = ConvertUtils.sourceToTarget(dto, GridForceInfoEntity.class);
+        if (StringUtils.isNotEmpty(dto.getDeptId())) {
+            fillDeptInfoByGridId(entity, Long.valueOf(dto.getDeptId()));
+        }else {
+            throw new RenException("请选择所属部门");
+        }
         updateById(entity);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml
index 566e5879c..3e480c4e5 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridForceInfoDao.xml
@@ -43,6 +43,9 @@
             AND (find_in_set(#{gridId},PARENT_DEPT_IDS)
             OR find_in_set(#{gridId},ALL_DEPT_IDS))
         </if>
+        <if test="deptId != null and deptId != ''">
+            AND DEPT_ID = #{deptId}
+        </if>
         ORDER BY
         SORT ASC,
         CREATED_TIME DESC