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/ClerkApiServiceImpl.java

@@ -546,6 +546,11 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             return responseErrorElement(ImportClerkBatchResultEnum.D3);
         }
         ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
+        if (clerkInfo.getClerkType() == 1) {
+            clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
+        } else if (clerkInfo.getClerkType() == 0) {
+            clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_POSITION_ID);
+        }
 
         TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
         boolean isAdd = true;