fix：多好办对应1gic，督导绑定修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java

@@ -72,7 +72,7 @@ public interface StaffClerkRelationApiService {
 
     List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds);
 
-    List<StaffClerkRelationDTO> listByClerkIdsEnterpriseId(List<String> clerkIds, String enterpriseId);
+    List<StaffClerkRelationDTO> listByClerkIdsWxEnterpriseId(List<String> clerkIds, String wxEnterpriseId);
 
     /**
      * 导购列表
@@ -104,7 +104,7 @@ public interface StaffClerkRelationApiService {
 
     /**
      * @param enterpriseId
-     * @param wxUserId
+     * @param staffid
      * @return
      */
     List<StaffClerkRelationDTO> listByEnterpriseIdAndStaffid(String enterpriseId, String staffid);

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

@@ -63,7 +63,7 @@ public interface TabHaobanStaffClerkRelationMapper {
      * @date 2022-01-13 11:36:11
      */
     List<StaffClerkRelationDTO> listByClerkIds(@Param("clerkIds") List<String> clerkIds,
-                                               @Param("enterpriseId") String enterpriseId);
+                                               @Param("wxEnterpriseId") String wxEnterpriseId);
 
     List<TabHaobanStaffClerkRelation> listByStoreId(@Param("storeId") String storeId);
 
@@ -76,7 +76,7 @@ public interface TabHaobanStaffClerkRelationMapper {
 
     TabHaobanStaffClerkRelation getOneBindStoreId(@Param("staffId") String staffId, @Param("storeId") String storeId);
 
-    TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId") String clerkId, @Param("enterpriseId") String enterpriseId);
+    TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId") String clerkId, @Param("wxEnterpriseId") String wxEnterpriseId);
 
     int delByPrimaryKey(@Param("staffClerkRelationId") String staffClerkRelationId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java

@@ -60,7 +60,7 @@ public interface StaffClerkRelationService {
 
     StaffClerkRelationDTO getByClerkId(String clerkId);
 
-    StaffClerkRelationDTO getByClerkId(String clerkId,String enterpriseId);
+    StaffClerkRelationDTO getByClerkId(String clerkId,String wxEnterpriseId);
 
     List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList);
 

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

@@ -249,8 +249,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     }
 
     @Override
-    public StaffClerkRelationDTO getByClerkId(String clerkId, String enterpriseId) {
-        TabHaobanStaffClerkRelation staffClerkRelation = mapper.getByClerkId(clerkId, enterpriseId);
+    public StaffClerkRelationDTO getByClerkId(String clerkId, String wxEnterpriseId) {
+        TabHaobanStaffClerkRelation staffClerkRelation = mapper.getByClerkId(clerkId, wxEnterpriseId);
         return EntityUtil.changeEntityNew(StaffClerkRelationDTO.class,staffClerkRelation);
     }
 

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

@@ -220,11 +220,11 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     }
 
     @Override
-    public List<StaffClerkRelationDTO> listByClerkIdsEnterpriseId(List<String> clerkIds, String enterpriseId) {
+    public List<StaffClerkRelationDTO> listByClerkIdsWxEnterpriseId(List<String> clerkIds, String wxEnterpriseId) {
         if (CollectionUtil.isEmpty(clerkIds)) {
             return Collections.emptyList();
         }
-        return tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds, enterpriseId);
+        return tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIds, wxEnterpriseId);
     }
 
     @Override
@@ -299,13 +299,14 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
     private ServiceResponse getManageFlagBind(StaffClerkRelationDTO staffClerkRelation) {
         String enterpriseId = staffClerkRelation.getEnterpriseId();
+        String wxEnterpriseId = staffClerkRelation.getWxEnterpriseId();
         String clerkId = staffClerkRelation.getClerkId();
         String staffId = staffClerkRelation.getStaffId();
         boolean bindFlag = staffClerkRelationService.getBindByStaffIdAndEnterpriseId(enterpriseId, staffId);
         if (bindFlag) {
             return ServiceResponse.failure("3", "该员工已经绑定，不允许绑定区经/督导");
         }
-        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId, enterpriseId);
+        StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId, wxEnterpriseId);
         if (staffClerkRelationDTO != null) {
             return ServiceResponse.failure("3", "该导购已经被绑定，不允许绑定");
         }

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

@@ -135,8 +135,8 @@
         <foreach collection="clerkIds" item="id" index="index" open="(" close=")" separator=",">
             #{id,jdbcType=VARCHAR}
         </foreach>
-        <if test="enterpriseId != null and enterpriseId != ''">
-            and a.enterprise_id = #{enterpriseId}
+        <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
+            and a.wx_enterprise_id = #{wxEnterpriseId}
         </if>
     </select>
 
@@ -186,8 +186,8 @@
         from tab_haoban_staff_clerk_relation
         where clerk_id = #{clerkId,jdbcType=VARCHAR}
         and status_flag=1
-        <if test="enterpriseId != null and enterpriseId != ''">
-            and enterprise_id = #{enterpriseId}
+        <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
+            and wx_enterprise_id = #{wxEnterpriseId}
         </if>
         order by create_time desc limit 1
     </select>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -327,7 +327,7 @@ public class StaffController extends WebBaseController {
             List<String> clerkIds = retList.stream().map(ClerkInfoVo::getClerkId).collect(Collectors.toList());
             List<StaffClerkRelationDTO> dtos = new ArrayList<>();
             if (manageFlag != null && manageFlag == 1) {
-                dtos = staffClerkRelationApiService.listByClerkIdsEnterpriseId(clerkIds, enterpriseId);
+                dtos = staffClerkRelationApiService.listByClerkIdsWxEnterpriseId(clerkIds, wxEnterpriseId);
             } else {
                 dtos = staffClerkRelationApiService.listByClerkIds(clerkIds);
             }