Merge branch 'fixbug_0525' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

 package com.gic.haoban.manage.service.dao.mapper;
 
+import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
@@ -23,12 +24,12 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
 
-    Page<TabHaobanStaff> pageStaff(@Param("staffIds") List<String> staffIds,
-                                   @Param("activeFlag") Integer activeFlag,
-                                   @Param("keyword") String keyword,
-                                   @Param("departmentIds") List<String> departmentIds,
-                                   @Param("wxEnterpriseId") String wxEnterpriseId,
-                                   @Param("relationFlag") Integer relationFlag);
+    Page<StaffDTO> pageStaff(@Param("staffIds") List<String> staffIds,
+                             @Param("activeFlag") Integer activeFlag,
+                             @Param("keyword") String keyword,
+                             @Param("departmentIds") List<String> departmentIds,
+                             @Param("wxEnterpriseId") String wxEnterpriseId,
+                             @Param("relationFlag") Integer relationFlag);
 
     /**
      * 选择用户id和企业标识

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java

@@ -14,7 +14,7 @@ public interface StaffService {
 
     String add(TabHaobanStaff tab);
 
-    Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag,
+    Page<StaffDTO> pageStaff(List<String> staffIds, Integer activeFlag,
                                    String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag);
 
     void updateByPrimaryKey(TabHaobanStaff tab);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -64,7 +64,7 @@ public class StaffServiceImpl implements StaffService {
     }
 
     @Override
-    public Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag) {
+    public Page<StaffDTO> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag) {
         return mapper.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag);
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -217,13 +217,12 @@ public class StaffApiServiceImpl implements StaffApiService {
             staffIds = relationList.stream().map(TabHaobanStaffClerkRelation::getStaffId).collect(Collectors.toList());
         }
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag), StaffDTO.class);
+        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag));
         List<StaffDTO> staffDTOList = page.getResult();
         if (CollectionUtils.isEmpty(staffDTOList)) {
             return new Page<>();
         }
         staffDTOList.forEach(one -> {
-            //one.setDepartmentIds(Objects.isNull(related) ? null : related.getDepartmentId());
             // 关联状态
             List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationService.listByStaffId(wxEnterpriseId, one.getStaffId());
             one.setRelationFlag(CollectionUtils.isNotEmpty(staffClerkRelationDTOS) ? 1 : 0);

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -273,9 +273,10 @@
         and status_flag = 1
     </select>
 
-    <select id="pageStaff" resultMap="BaseResultMap">
+    <select id="pageStaff" resultType="com.gic.haoban.manage.api.dto.StaffDTO">
         select
-        a.*
+        a.*,
+        b.department_id departmentIds
         from tab_haoban_staff a
         left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id
         where a.status_flag = 1 and a.wx_enterprise_id = #{wxEnterpriseId}