From 0094461b776d21143234e58ed9918f22d2586b00 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 23 Dec 2021 10:28:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/AgencyListResultDTO.java |  8 +++---
 .../dto/result/DepartmentListResultDTO.java   |  2 +-
 .../epmet/dto/result/ParentListResultDTO.java | 12 ++++++++
 .../com/epmet/controller/GridController.java  | 28 +++++++++++--------
 .../resources/mapper/CustomerAgencyDao.xml    | 13 ++++++---
 .../mapper/CustomerDepartmentDao.xml          |  6 ++--
 .../main/resources/mapper/CustomerGridDao.xml | 12 +++++---
 7 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
index bb959e6a38..499219f9eb 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java
@@ -45,18 +45,18 @@ public class AgencyListResultDTO implements Serializable {
     /**
      * 总人数
      */
-    private Integer totalUser;
+    private Integer totalUser = 0;
     /**
      * 编码
      */
-    private String code;
+    private String code = "";
     /**
      * 负责人
      */
-    private String contacts;
+    private String contacts = "";
     /**
      * 联系电话
      */
-    private String mobile;
+    private String mobile = "";
 
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
index e6aa5636bc..8e3b3ce418 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java
@@ -49,7 +49,7 @@ public class DepartmentListResultDTO implements Serializable {
     /**
      * 编码
      */
-    private String code;
+    private String code = "";
     /**
      * 负责人
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
index b9222196f9..ffa9e12e3e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ParentListResultDTO.java
@@ -51,4 +51,16 @@ public class ParentListResultDTO implements Serializable {
      * 增加此返回值，为了调试用
      */
     private String areaCode;
+    /**
+     * 组织编码[手动输入的]
+     */
+    private String code;
+    /**
+     * 负责人
+     */
+    private String contacts;
+    /**
+     * 联系电话
+     */
+    private String mobile;
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
index 7f38a198cf..f7c4d8ec10 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
@@ -55,12 +55,14 @@ public class GridController {
         Result<AddGridResultDTO> resultDTOResult = customerGridService.addGrid(tokenDto,addGridFormDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setCustomerId(tokenDto.getCustomerId());
-        mq.setOrgId(resultDTOResult.getData().getGridId());
-        mq.setOrgType("grid");
-        mq.setType("grid_create");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        if (resultDTOResult.success()) {
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+            mq.setCustomerId(tokenDto.getCustomerId());
+            mq.setOrgId(resultDTOResult.getData().getGridId());
+            mq.setOrgType("grid");
+            mq.setType("grid_create");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return resultDTOResult;
@@ -77,12 +79,14 @@ public class GridController {
         Result result = customerGridService.editGrid(tokenDto,editGridFormDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
-        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
-        mq.setCustomerId(tokenDto.getCustomerId());
-        mq.setOrgId(editGridFormDTO.getGridId());
-        mq.setOrgType("grid");
-        mq.setType("grid_change");
-        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        if (result.success()) {
+            OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+            mq.setCustomerId(tokenDto.getCustomerId());
+            mq.setOrgId(editGridFormDTO.getGridId());
+            mq.setOrgType("grid");
+            mq.setType("grid_change");
+            SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index c75ad15069..fd36cfc673 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -82,7 +82,12 @@
     <select id="selectPAgencyById" resultType="com.epmet.dto.result.ParentListResultDTO">
         SELECT
             id,
-            organization_name AS 'name'
+            organization_name AS 'name',
+            level AS 'level',
+            area_code AS 'areaCode',
+            code 'code',
+            contacts 'contacts',
+            mobile 'mobile'
         FROM customer_agency
         WHERE del_flag = '0'
         AND id IN
@@ -124,9 +129,9 @@
             id AS 'agencyId',
             organization_name AS 'agencyName',
             total_user AS 'totalUser',
-            code 'code',
-            contacts 'contacts',
-	        mobile 'mobile'
+            IFNULL(code,'')AS 'code',
+            IFNULL(contacts,'')AS 'contacts',
+            IFNULL(mobile,'')AS 'mobile'
         FROM customer_agency
         WHERE del_flag = '0'
         AND pid = #{pId}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index 8ed7d3d378..9bbe9e96b7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -24,9 +24,9 @@
             id AS 'departmentId',
             department_name AS 'departmentName',
             total_user AS 'totalUser',
-            code AS 'code',
-            contacts AS 'contacts',
-	        mobile AS 'mobile'
+            IFNULL(code,'')AS 'code',
+            IFNULL(contacts,'')AS 'contacts',
+            IFNULL(mobile,'')AS 'mobile'
         FROM customer_department
         WHERE del_flag = '0'
         AND agency_id = #{agencyId}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index d5c412343d..02e6a67cb2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -237,6 +237,10 @@
         set
             grid_name = #{gridName},
             manage_district = #{manageDistrict},
+            code = #{code},
+            grid_type = #{gridType},
+            contacts = #{contacts},
+            mobile = #{mobile},
             updated_by = #{updatedBy},
             UPDATED_TIME=NOW()
         where
@@ -284,10 +288,10 @@
             id AS gridId,
             IFNULL(grid_name,"") AS gridName,
             total_user,
-            code,
-            grid_type,
-            contacts,
-            mobile
+            IFNULL(code,'')AS 'code',
+            IFNULL(grid_type,'')AS 'gridType',
+            IFNULL(contacts,'')AS 'contacts',
+            IFNULL(mobile,'')AS 'mobile'
         FROM
             CUSTOMER_GRID
         <where>