Merge branch 'developer' into 'master'

Developer

See merge request !41

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) {