fix:多人活码任意取一个数据展示

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

@@ -375,33 +375,35 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
      */
     private List<String> setStoreClerk(HmQrcodeQDTO hmQrcodeQDTO, String wxEnterpriseId, Long hmId, Integer hmType) {
         List<String> clerkIdList = hmQrcodeQDTO.getClerkIdList();
+        if (CollectionUtils.isEmpty(clerkIdList)) {
+            return null;
+        }
         if (hmType == 2) {
             //多人活码
             insertHmClerkRelation(hmQrcodeQDTO, wxEnterpriseId, hmId, clerkIdList);
-        } else if (hmType == 1) {
-            //单人活码
-            String clerkId = clerkIdList.get(0);
-            hmQrcodeQDTO.setClerkId(clerkId);
-            ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
-            if (clerkDTO != null) {
-                hmQrcodeQDTO.setClerkName(clerkDTO.getClerkName());
-                hmQrcodeQDTO.setClerkCode(clerkDTO.getClerkCode());
-                String storeId = clerkDTO.getStoreId();
-                hmQrcodeQDTO.setStoreId(storeId);
-                StoreDTO storeDTO = storeService.getStore(storeId);
-                if (storeDTO != null) {
-                    hmQrcodeQDTO.setStoreCode(storeDTO.getStoreCode());
-                    hmQrcodeQDTO.setStoreName(storeDTO.getStoreName());
-                }
+        }
+        //单人活码
+        String clerkId = clerkIdList.get(0);
+        hmQrcodeQDTO.setClerkId(clerkId);
+        ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+        if (clerkDTO != null) {
+            hmQrcodeQDTO.setClerkName(clerkDTO.getClerkName());
+            hmQrcodeQDTO.setClerkCode(clerkDTO.getClerkCode());
+            String storeId = clerkDTO.getStoreId();
+            hmQrcodeQDTO.setStoreId(storeId);
+            StoreDTO storeDTO = storeService.getStore(storeId);
+            if (storeDTO != null) {
+                hmQrcodeQDTO.setStoreCode(storeDTO.getStoreCode());
+                hmQrcodeQDTO.setStoreName(storeDTO.getStoreName());
             }
-            StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
-            if (staffClerkRelationDTO != null) {
-                hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
-                TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
-                if (tabHaobanStaff != null) {
-                    hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
-                    hmQrcodeQDTO.setWxUserId(tabHaobanStaff.getWxUserId());
-                }
+        }
+        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
+        if (staffClerkRelationDTO != null) {
+            hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
+            TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
+            if (tabHaobanStaff != null) {
+                hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
+                hmQrcodeQDTO.setWxUserId(tabHaobanStaff.getWxUserId());
             }
         }
         return clerkIdList;