fix:查询区经列表修改

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

@@ -1040,7 +1040,7 @@ public class ClerkController extends WebBaseController {
      * @return
      */
     @RequestMapping("clerk-manage-list")
-    public RestResponse<List<BindClerkVO>> clerkManageList(String enterpriseId) {
+    public RestResponse clerkManageList(String enterpriseId) {
         List<ClerkDTO> list = clerkService.listClerkEnableHaoban(Collections.singletonList(enterpriseId), null);
         if (CollectionUtils.isEmpty(list)) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_10016.getCode()), HaoBanErrCode.ERR_10016.getMsg());
@@ -1049,6 +1049,7 @@ public class ClerkController extends WebBaseController {
         List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(enterpriseId, clerkCodeList);
         Map<String, StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s -> s));
         List<BindClerkVO> bindList = new ArrayList<>();
+        List<BindClerkVO> unBindList = new ArrayList<>();
         for (ClerkDTO dto : list) {
             BindClerkVO vo = EntityUtil.changeEntityByJSON(BindClerkVO.class, dto);
             if (bindCodeMap.containsKey(dto.getClerkCode())) {
@@ -1059,9 +1060,14 @@ public class ClerkController extends WebBaseController {
                 vo.setPhoneNumber(dto.getPhoneNumber());
                 vo.setStaffName(staffDTO == null ? "" : staffDTO.getStaffName());
                 bindList.add(vo);
+            } else {
+                unBindList.add(vo);
             }
         }
-        return RestResponse.successResult(bindList);
+        Map<String, Object> map = new HashMap<>();
+        map.put("bindList", bindList);
+        map.put("unBindList", unBindList);
+        return RestResponse.successResult(map);
     }
 
     /**