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

@@ -466,11 +466,9 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     public ServiceResponse<ClerkDTO> getHeadClerk(Integer enterpriseId, Integer storeId) {
         ServiceResponse<StoreDTO> response = storeApiService.getStoreById(enterpriseId, storeId);
         if (response.isSuccess() && response.getResult() != null) {
-            List<Integer> storeInfoIds = new ArrayList<>();
-            storeInfoIds.add(response.getResult().getStoreInfoId());
-            List<TabClerk> clerkList = clerkService.listClerkByStoreInfoId( enterpriseId, storeInfoIds, null, 1);
-            if (CollectionUtils.isNotEmpty(clerkList)) {
-                return ServiceResponse.success(EntityUtil.changeEntityNew(ClerkDTO.class, clerkList.get(0)));
+            TabClerk clerkLeader = clerkService.getClerkLeaderByStoreInfoId(enterpriseId, response.getResult().getStoreInfoId());
+            if (clerkLeader != null) {
+                return ServiceResponse.success(EntityUtil.changeEntityNew(ClerkDTO.class, clerkLeader));
             }
         }
         return ServiceResponse.success();

gic-store-service/src/main/resources/mapper/TabClerkMapper.xml

@@ -247,9 +247,6 @@
     <if test="search != null and search != '' ">
       and (clerk_code like concat('%', #{search} ,'%') or clerk_name like concat('%', #{search} ,'%') )
     </if>
-    <if test="clerkType != null ">
-        and clerk_type = #{clerkType}
-    </if>
     <if test="status != null ">
         and status = #{status}
     </if>