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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -22,7 +22,7 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId);
 
-    List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName);
+    List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
 
     Page<TabHaobanStaff> pageStaff(@Param("staffIds") Set<String> staffIds, @Param("activeFlag") Integer activeFlag, @Param("keyword") String keyword);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -99,7 +99,7 @@ public class AuditApiServiceImpl implements AuditApiService {
                 storeIds.addAll(storeIds1);
             }
             //模糊查staffName
-            List<TabHaobanStaff> staffList = staffMapper.listLikeName(search);
+            List<TabHaobanStaff> staffList = staffMapper.listLikeName(search, wxEnterpriseId);
             if (CollectionUtil.isNotEmpty(staffList)) {
                 List<String> staffIds2 = staffList.stream().map(s -> s.getStaffId()).collect(Collectors.toList());
                 staffIds.addAll(staffIds2);

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -316,7 +316,12 @@
         <include refid="Base_Column_List"/>
         from tab_haoban_staff
         where status_flag = 1
-        and staff_name like CONCAT('%',#{staffName,jdbcType=VARCHAR},'%')
+        <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
+            and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+        </if>
+        <if test="staffName != null and staffName != ''">
+            and staff_name like CONCAT('%',#{staffName,jdbcType=VARCHAR},'%')
+        </if>
     </select>
 
     <select id="selectByUserIdAndEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">