通讯录导出加导购code

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -493,7 +493,7 @@ public class StaffController extends WebBaseController {
     @RequestMapping("staff-export")
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response,String departmentId, Integer activeFlag, Integer relationFlag,
                                       String keyWord, String permitState,BasePageInfo pageInfo,@RequestParam(defaultValue = "create_time") String sortField,
-                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam,String startTime,String endTime) {
+                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam,String startTime,String endTime ,String clerkId) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         if(StringUtils.isBlank(departmentId)){
@@ -520,6 +520,13 @@ public class StaffController extends WebBaseController {
         dto.setEnterpriseIdParam(enterpriseIdParam);
         dto.setStartTime(startTime);
         dto.setEndTime(endTime);
+        if(StringUtils.isNotBlank(clerkId)) {
+            StaffClerkRelationDTO clerkRelationDTO = this.staffClerkRelationApiService.getByClerkId(clerkId) ;
+            if(null == clerkRelationDTO) {
+                return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(new Page<>()));
+            }
+            dto.setStaffId(clerkRelationDTO.getStaffId());
+        }
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;
         while (true) {
@@ -631,7 +638,7 @@ public class StaffController extends WebBaseController {
                 for (StaffClerkRelationDTO staffClerkRelationDTO : relationList) {
                     ClerkDTO clerk = clerkMap.get(staffClerkRelationDTO.getClerkId());
                     if (clerk != null) {
-                        clerkName.append(clerk.getClerkName()).append(",");
+                        clerkName.append(clerk.getClerkName()).append("(").append(clerk.getClerkCode()).append(")").append(",");
                     }
                 }
                 if (StringUtils.isNoneBlank(clerkName.toString())) {