Merge remote-tracking branch 'origin/developer' into developer

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

@@ -314,8 +314,8 @@ public class ClerkController extends DownloadUtils {
     }
 
     @RequestMapping("/list-clerk-in-store")
-    public RestResponse listClerkInStore(Integer storeId, String search) {
-        ServiceResponse<List<ClerkDTO>> serviceResponse = clerkApiService.listClerkByStoreInfoId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId, search);
+    public RestResponse listClerkInStore(Integer storeInfoId, String search) {
+        ServiceResponse<List<ClerkDTO>> serviceResponse = clerkApiService.listClerkByStoreInfoId(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoId, search);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 

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

@@ -145,7 +145,7 @@ public class StoreController extends DownloadUtils {
         storeDTO.setOperatorId(UserDetailUtils.getUserDetail().getUserId());
         storeDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         // 保存店长
-        if (storeQO.getStoreId() != null) {
+        if (storeQO.getStoreId() == null) {
             ClerkDTO saveClerk = getSaveClerk(clerkQO);
             storeDTO.setClerkLeader(saveClerk);
         }