Merge remote-tracking branch 'origin/develop' into release_temp

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);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -477,10 +477,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();
         }

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>

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`;