From 3016821346cbfbc6de383ecb393f6ef0ca80a490 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 26 Aug 2021 17:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dao/epmetuser/StaffRoleDao.java    | 10 ++++++++++
 .../epmetuser/impl/EpmetUserServiceImpl.java     |  5 +----
 .../resources/mapper/epmetuser/StaffRoleDao.xml  | 16 ++++++++++++++++
 .../V0.0.7__edit_staff_transfer_record.sql       |  5 +++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.7__edit_staff_transfer_record.sql

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java
index bfee2a0129..52b425be78 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java
@@ -64,4 +64,14 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      */
     List<RoleListResultDTO> getRoleCountList(@Param("customerId") String customerId);
 
+    /**
+     * @Description 根据角色查询人员列表
+     * @Param customerId
+     * @Param roleId
+     * @Return {@link List< StaffRoleEntity>}
+     * @Author zhaoqifeng
+     * @Date 2021/8/26 16:48
+     */
+    List<StaffRoleEntity> selectStaffByRole(@Param("customerId") String customerId, @Param("roleId") String roleId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 84cc6ea127..21fa74fabd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -474,10 +474,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<RoleUsersResultDTO> getRoleUsers(RoleUsersFormDTO formDTO) {
-        LambdaQueryWrapper<StaffRoleEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StaffRoleEntity :: getCustomerId, formDTO.getCustomerId());
-        wrapper.eq(StaffRoleEntity::getRoleId, formDTO.getRoleId());
-        List<StaffRoleEntity> staffRoleList = staffRoleDao.selectList(wrapper);
+        List<StaffRoleEntity> staffRoleList = staffRoleDao.selectStaffByRole(formDTO.getCustomerId(), formDTO.getRoleId());
         if (CollectionUtils.isEmpty(staffRoleList)) {
             return Collections.emptyList();
         }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
index 4d96ec7735..8d1ac0c2d2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml
@@ -70,4 +70,20 @@
         GROUP BY
                 ROLE_ID
     </select>
+    <select id="selectStaffByRole" resultType="com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity">
+        SELECT
+                b.CUSTOMER_ID,
+                b.STAFF_ID,
+                b.ROLE_ID,
+                b.ORG_ID
+        FROM
+                customer_staff a
+                        INNER JOIN staff_role b ON a.USER_ID = b.STAFF_ID
+                        AND b.DEL_FLAG = '0'
+        WHERE
+                a.DEL_FLAG = '0'
+          AND a.CUSTOMER_ID = #{customerId}
+          AND b.CUSTOMER_ID = #{customerId}
+          AND b.ROLE_ID = #{roleId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.7__edit_staff_transfer_record.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.7__edit_staff_transfer_record.sql
new file mode 100644
index 0000000000..16f8bd1120
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.7__edit_staff_transfer_record.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `staff_transfer_record`
+    ADD COLUMN `OLD_ORG_TYPE` varchar(10) NULL COMMENT '调动前所属部门dept或网格grid' AFTER `OLD_AGENCY_ID`,
+    ADD COLUMN `OLD_ORG_ID` varchar(64) NULL COMMENT '部门ID 或 网格ID' AFTER `OLD_ORG_TYPE`,
+    ADD COLUMN `ORG_TYPE` varchar(10) NULL COMMENT '调动后所属部门dept或网格grid' AFTER `AGENCY_ID`,
+    ADD COLUMN `ORG_ID` varchar(64) NULL COMMENT '部门ID 或 网格ID' AFTER `ORG_TYPE`;
\ No newline at end of file