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

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabClerkMapper.java

@@ -265,4 +265,15 @@ public interface TabClerkMapper {
      * @throws
      */
     List<Integer> listStoreInfoIdByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeInfoIdList);
+
+    /**
+     * listClerkIdByStoreInfoId
+     * @Title: listClerkIdByStoreInfoId
+     * @Description: 
+     * @author taogs 
+ * @param storeInfoIdList
+     * @return java.util.List<java.lang.Integer>
+     * @throws 
+     */
+    List<Integer> listClerkIdByStoreInfoId( @Param("ids") List<Integer> storeInfoIdList);
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/ClerkService.java

@@ -318,4 +318,15 @@ public interface ClerkService {
      * @throws 
      */
     List<Integer> listStoreInfoIdByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIdList);
+
+    /**
+     * listStoreInfoIdByStoreInfoId
+     * @Title: listStoreInfoIdByStoreInfoId
+     * @Description: 查询导购idlist
+     * @author taogs
+     * @param storeInfoIdList
+     * @return java.util.List<java.lang.Integer>
+     * @throws
+     */
+    List<Integer> listClerkIdByStoreInfoId(List<Integer> storeInfoIdList);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java

@@ -205,4 +205,9 @@ public class ClerkServiceImpl implements ClerkService {
         return tabClerkMapper.listStoreInfoIdByStoreInfoId(enterpriseId, storeInfoIdList);
     }
 
+    @Override
+    public List<Integer> listClerkIdByStoreInfoId(List<Integer> storeInfoIdList){
+        return tabClerkMapper.listClerkIdByStoreInfoId(storeInfoIdList);
+    }
+
 }

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

@@ -944,7 +944,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
 
     @Override
     public ServiceResponse<List<Integer>> listClerkId(List<Integer> storeInfoIdList) {
-        List<Integer> list = this.clerkService.listStoreInfoIdByStoreInfoId(null, storeInfoIdList);
+        List<Integer> list = this.clerkService.listClerkIdByStoreInfoId(storeInfoIdList);
         return ServiceResponse.success(list);
     }
 

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

@@ -430,4 +430,16 @@
       </foreach>
     </if>
   </select>
+  <select id="listClerkIdByStoreInfoId" resultType="int">
+    select
+    clerk_id
+    from tab_clerk where status = 1
+    <if test="null != ids and ids.size > 0">
+      and store_info_id in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    order by position_id asc,clerk_name asc
+  </select>
 </mapper>
\ No newline at end of file