Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -176,7 +176,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (CollectionUtils.isEmpty(data)){
             return new ArrayList<>();
         }
-        return data;
+        gridStaff.stream().forEach(g -> data.stream().filter(d -> g.getStaffId().equals(d.getStaffId()) && g.getGridId().equals(d.getGridId())).forEach(d -> g.setMobile(d.getMobile())));
+        return gridStaff.stream().filter(g -> StringUtils.isNotBlank(g.getMobile())).collect(Collectors.toList());
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java

@@ -138,6 +138,8 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      */
     List<GridStaffResultDTO> staffGridRole(@Param("forms") List<GridStaffResultDTO> forms);
 
+    List<GridStaffResultDTO> staffGridRoleByIds(@Param("ids") List<String> ids);
+
     /**
      * @Description  查询角色
      * @Param userIds

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.entity.StaffRoleEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.StaffRoleService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -136,7 +137,9 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         if (CollectionUtils.isEmpty(forms)){
             return new ArrayList<>();
         }
-        List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);
+        List<String> userIds = forms.stream().map(m -> m.getStaffId()).distinct().collect(Collectors.toList());
+        List<GridStaffResultDTO> result = baseDao.staffGridRoleByIds(userIds);
+        /*List<GridStaffResultDTO> result = baseDao.staffGridRole(forms);*/
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -210,6 +210,23 @@
         </foreach>
     </select>
 
+    <select id="staffGridRoleByIds" resultType="com.epmet.dto.result.GridStaffResultDTO">
+        SELECT
+            sr.org_id as gridId,
+            sr.STAFF_ID,
+            cs.MOBILE
+        FROM staff_role sr
+        LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = 0
+        LEFT JOIN  customer_staff cs ON cs.USER_ID = sr.STAFF_ID AND cs.customer_id = sr.customer_id AND cs.DEL_FLAG = 0
+        WHERE sr.DEL_FLAG = 0
+        AND gsr.ROLE_KEY = 'grid_member'
+        AND sr.STAFF_ID in (
+            <foreach collection="ids" item="id" separator=",">
+                #{id}
+            </foreach>
+            )
+    </select>
+
     <!-- 查询角色 -->
     <select id="getRolesByDB" resultType="com.epmet.dto.result.RoleKeyValueResultDTO">
         SELECT