From 7c3e4c60be169d5ef8170783e428afe383ab44f2 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 20 Aug 2021 17:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=A1=A5=E7=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/epmetuser/CustomerStaffDao.xml  | 8 ++++----
 .../resources/mapper/govorg/CustomerStaffAgencyDao.xml    | 4 ++--
 .../java/com/epmet/service/impl/StaffServiceImpl.java     | 3 ++-
 .../src/main/resources/mapper/CustomerAgencyDao.xml       | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index 6fea2678fe..2f1cae9706 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -68,10 +68,10 @@
                     sr.staff_id,
                     case when gsr.role_key =
                     <choose>
-                        <when test="orgType != null orgType == 'agency' ">
+                        <when test="orgType != null and orgType == 'agency' ">
                             'agency_leader'
                         </when>
-                        <when test="orgType != null orgType == 'dept' ">
+                        <when test="orgType != null and orgType == 'dept' ">
                             'dept_leader'
                         </when>
                         <otherwise>
@@ -92,10 +92,10 @@
                 ORDER BY
                     gsr.role_key <![CDATA[<>]]>
                     <choose>
-                        <when test="orgType != null orgType == 'agency' ">
+                        <when test="orgType != null and orgType == 'agency' ">
                             'agency_leader'
                         </when>
-                        <when test="orgType != null orgType == 'dept' ">
+                        <when test="orgType != null and orgType == 'dept' ">
                             'dept_leader'
                         </when>
                         <otherwise>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
index d08de26805..29da78941d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
@@ -53,7 +53,7 @@
 
     <select id="selectStaffList" resultType="java.lang.String">
         <choose>
-            <when test="orgType != null orgType == 'dept' ">
+            <when test="orgType != null and orgType == 'dept' ">
                 SELECT
                     user_id
                 FROM
@@ -64,7 +64,7 @@
                 ORDER BY
                     created_time ASC
             </when>
-            <when test="orgType != null orgType == 'grid' ">
+            <when test="orgType != null and orgType == 'grid' ">
                 SELECT
                     user_id
                 FROM
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
index 2c9bcd51b0..3aaa7a5484 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
@@ -331,6 +331,7 @@ public class StaffServiceImpl implements StaffService {
 
 		//2.调用user服务，新增用户信息
 		StaffSubmitFromDTO submitDTO = ConvertUtils.sourceToTarget(fromDTO, StaffSubmitFromDTO.class);
+		submitDTO.setAgencyId(fromDTO.getOrgId());
 		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaff(submitDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
@@ -380,7 +381,7 @@ public class StaffServiceImpl implements StaffService {
 		StaffOrgRelationEntity staffOrgRelationEntity = new StaffOrgRelationEntity();
 		staffOrgRelationEntity.setCustomerId(fromDTO.getCustomerId());
 		if("agency".equals(fromDTO.getOrgType())){
-			staffOrgRelationEntity.setPids(("".equals(orgDTO.getPids()) ? "" : orgDTO.getPids() + ":"));
+			staffOrgRelationEntity.setPids(("".equals(orgDTO.getPids()) ? "" : orgDTO.getPids()));
 		}else {
 			staffOrgRelationEntity.setPids(("".equals(orgDTO.getPids()) ? "" : orgDTO.getPids() + ":") + orgDTO.getAgencyId());
 		}
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 ba8a00245d..a30207d922 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
@@ -444,7 +444,7 @@
 
     <select id="selectAgencyDetail" resultType="com.epmet.dto.result.OrgResultDTO">
         <choose>
-            <when test="orgType != null orgType == 'dept' ">
+            <when test="orgType != null and orgType == 'dept' ">
                 SELECT
                     ca.customer_id,
                     ca.id AS "agencyId",
@@ -464,7 +464,7 @@
                 AND ca.del_flag = '0'
                 AND cd.id = #{orgId}
             </when>
-            <when test="orgType != null orgType == 'grid' ">
+            <when test="orgType != null and orgType == 'grid' ">
                 SELECT
                     ca.customer_id,
                     ca.id AS "agencyId",