企微托管

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

@@ -111,6 +111,9 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         }
         PageHelper.startPage(basePageInfo);
         List<OpenStaffListDTO> list = this.openStaffMapper.list(qdto);
+        if(CollectionUtils.isEmpty(list)) {
+            return ServiceResponse.success(new Page<>());
+        }
         Set<String> staffIdList = list.stream().map(dto -> dto.getStaffId()).collect(Collectors.toSet());
         List<StaffClerkRelationDTO> relationDTOList = staffClerkRelationService.listByWxEnterpriseIdAndStaffId(wxEnterpriseId, staffIdList);
         relationDTOList = relationDTOList.stream().filter(o->o.getEnterpriseId().equals(enterpriseId)).collect(Collectors.toList()) ;

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

@@ -163,12 +163,12 @@ public class QywxOpenController {
      * @return
      */
     @RequestMapping("get-2qrcode")
-    public RestResponse<Void> get2Qrcode(Long openStaffId) {
+    public RestResponse<OpenStaffDTO> get2Qrcode(Long openStaffId) {
         ServiceResponse<OpenStaffDTO>  resp = this.openStaffApiService.get2Qrcode(openStaffId) ;
         if(!resp.isSuccess()) {
             return RestResponse.failure("9999",resp.getMessage()) ;
         }
-        return RestResponse.successResult();
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**