链接

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

@@ -242,11 +242,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         if (StringUtils.isBlank(clerkId) || "-1".equals(clerkId)) {
             return null;
         }
-        List<HmQrcodeBO> hmList = this.hmQrcodeService.listByClerkId(clerkId, wxEnterpriseId);
-        if (CollectionUtils.isNotEmpty(hmList)) {
-            return hmList.get(0);
-        }
-        return null;
+        HmQrcodeBO hm = this.hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId, 0);
+        return hm;
     }
 
     private HmQrcodeBO getHmFormStore(String wxEnterpriseId, String inStoreId, int dz, int dy) {

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

@@ -70,6 +70,7 @@ public class HmStoreController {
     @ResponseBody
     public RestResponse<Object> listStoreClerk(HttpServletRequest request, BasePageInfo basePageInfo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
         // 分组id
         String storeGroupId = request.getParameter("storeGroupId");
         // 门店参数
@@ -114,12 +115,12 @@ public class HmStoreController {
         retPage.setTotalPage(page.getTotalPage());
         List<ClerkStoreListVO> result = EntityUtil.changeEntityListByJSON(ClerkStoreListVO.class, page.getResult());
         // 好办状态
-        this.haobanStatus(result);
+        this.haobanStatus(result,wxEnterpriseId);
         retPage.setResult(result);
         return RestResponse.successResult(retPage);
     }
 
-    private void haobanStatus(List<ClerkStoreListVO> list) {
+    private void haobanStatus(List<ClerkStoreListVO> list , String wxEnterpriseId) {
         List<String> clerkIdList = new ArrayList<>();
         if (CollectionUtils.isEmpty(list)) {
             return;
@@ -144,11 +145,11 @@ public class HmStoreController {
         List<String> statusList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(clerkIdList)) {
             List<StaffClerkRelationDTO> clerkRelationList = this.staffClerkRelationApiService
-                    .listByClerkIds(clerkIdList);
+                    .listClerkIdConcatFlagByClerkIds(clerkIdList,wxEnterpriseId);
             if (CollectionUtils.isNotEmpty(clerkRelationList)) {
-                status2List.addAll(clerkRelationList.stream().filter(dto -> dto.getStatusFlag() == 1)
+                status2List.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag()== 0)
                         .map(dto -> dto.getClerkId()).collect(Collectors.toList()));
-                statusList.addAll(clerkRelationList.stream().filter(dto -> dto.getStatusFlag() == 2)
+                statusList.addAll(clerkRelationList.stream().filter(dto -> dto.getOpenConcatFlag() == 1)
                         .map(dto -> dto.getClerkId()).collect(Collectors.toList()));
             }
         }