Merge branch 'fixbug_0525' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaff.java

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;
@@ -24,7 +23,7 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
 
-    Page<StaffDTO> pageStaff(@Param("staffIds") List<String> staffIds,
+    Page<TabHaobanStaff> pageStaff(@Param("staffIds") List<String> staffIds,
                              @Param("activeFlag") Integer activeFlag,
                              @Param("keyword") String keyword,
                              @Param("departmentIds") List<String> departmentIds,

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

 package com.gic.haoban.manage.service.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -47,7 +49,10 @@ public class TabHaobanStaff implements Serializable {
 
     private String wxOpenId;
     private String qrCode;
-    
+
+    @TableField(exist = false)
+    private String departmentIds;
+
     public String getStaffId() {
         return staffId;
     }
@@ -215,4 +220,12 @@ public class TabHaobanStaff implements Serializable {
     public void setQrCode(String qrCode) {
         this.qrCode = qrCode;
     }
+
+    public String getDepartmentIds() {
+        return departmentIds;
+    }
+
+    public void setDepartmentIds(String departmentIds) {
+        this.departmentIds = departmentIds;
+    }
 }
\ No newline at end of file

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<StaffDTO> pageStaff(List<String> staffIds, Integer activeFlag,
+    Page<TabHaobanStaff> 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<StaffDTO> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag) {
+    public Page<TabHaobanStaff> 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,7 +217,7 @@ 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));
+        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag),StaffDTO.class);
         List<StaffDTO> staffDTOList = page.getResult();
         if (CollectionUtils.isEmpty(staffDTOList)) {
             return new Page<>();

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

@@ -273,7 +273,7 @@
         and status_flag = 1
     </select>
 
-    <select id="pageStaff" resultType="com.gic.haoban.manage.api.dto.StaffDTO">
+    <select id="pageStaff" resultMap="BaseResultMap">
         select
         a.*,
         b.department_id departmentIds