店长逻辑修改

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java

@@ -122,8 +122,12 @@ public class ClerkServiceImpl implements ClerkService {
     public Integer updateClerkStatus(Integer enterpriseId, String clerkIds, Integer status) {
         List<Integer> clerkIdList;
         if (StringUtils.isNotBlank(clerkIds)) {
-            String[] split = clerkIds.split(GlobalInfo.FLAG_COMMA);
-            clerkIdList = Stream.of(split).map(Integer::parseInt).collect(Collectors.toList());
+            if (StringUtils.equals("all", clerkIds)) {
+                clerkIdList = null;
+            } else {
+                String[] split = clerkIds.split(GlobalInfo.FLAG_COMMA);
+                clerkIdList = Stream.of(split).map(Integer::parseInt).collect(Collectors.toList());
+            }
         } else {
             return 0;
         }

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -267,14 +267,20 @@ public class ClerkController extends DownloadUtils {
     @RequestMapping("/update-clerk-status")
     public RestResponse updateClerkStatus(String clerkIds, Integer status) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        ServiceResponse<List<ClerkDTO>> listClerkByIds = clerkApiService.listClerkByIds(enterpriseId, clerkIds);
         ServiceResponse serviceResponse = clerkApiService.updateClerkStatus(enterpriseId, clerkIds, status);
+
         if (serviceResponse.isSuccess()) {
-            List<ClerkDTO> clerkList = listClerkByIds.getResult();
-            if (CollectionUtils.isNotEmpty(clerkList)) {
-                String clerkNames = clerkList.stream().map(ClerkDTO::getClerkName).reduce((x, y) -> x + "," + y).orElse("");
+            if (!StringUtils.equals("all", clerkIds)) {
+                ServiceResponse<List<ClerkDTO>> listClerkByIds = clerkApiService.listClerkByIds(enterpriseId, clerkIds);
+                List<ClerkDTO> clerkList = listClerkByIds.getResult();
+                if (CollectionUtils.isNotEmpty(clerkList)) {
+                    String clerkNames = clerkList.stream().map(ClerkDTO::getClerkName).collect(Collectors.joining(","));
+                    String statusName = (Constants.NORMAL_STATUS.equals(status)) ? "启用" : "禁用";
+                    LogUtils.createLog("修改状态为" + statusName, clerkNames);
+                }
+            } else {
                 String statusName = (Constants.NORMAL_STATUS.equals(status)) ? "启用" : "禁用";
-                LogUtils.createLog("修改状态为" + statusName, clerkNames);
+                LogUtils.createLog("修改状态为" + statusName, "全部导购");
             }
             return RestResponse.success(serviceResponse.getResult());
         } else {