Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -207,11 +207,14 @@ public class StoreApiServiceImpl implements StoreApiService {
         }
 
         // 保存店长 如果店长保存失败 回滚数据
+        ServiceResponse<ClerkDTO> headClerk = this.clerkApiService.getHeadClerk(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
+        if(headClerk.isSuccess() && headClerk.getResult() == null){
             ServiceResponse<Void> serviceResponse = saveClerkLeader(storeDTO);
             if (!serviceResponse.isSuccess()) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return ServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
             }
+        }
 
         // 自定义属性
         String error = storeExtendService.saveOrUpdate(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), storeDTO.getStoreExtendList());

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

@@ -244,7 +244,7 @@ public class ClerkController extends DownloadUtils {
         }
         clerkDTO.setOperatorId(UserDetailUtils.getUserDetail().getUserId());
         clerkDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
-        if (!com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkQO.getPositionId())) {
+        if (clerkQO.getClerkId() != null && !com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID.equals(clerkQO.getPositionId())) {
             // 如果门店下只有一个导购 就不能修改店长
             List<ClerkDTO> dtoList = clerkApiService.listClerkByStoreInfoId(enterpriseId, clerkQO.getStoreInfoId(), null).getResult();
             if (CollectionUtils.isNotEmpty(dtoList) && dtoList.size() == 1) {