Merge branch 'master' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer

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

@@ -15,7 +15,7 @@ public interface StaffApiService {
 
     List<StaffDTO> listByIds(List<String> staffIds);
 
-    List<StaffDTO> listByWxUserId(String wxUserId);
+    List<StaffDTO> listByWxUserId(String wxUserId,String wxEnterpriseId);
 
     StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId, String nationcode, String phoneNumber);
 

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

@@ -20,7 +20,7 @@ public interface StaffMapper {
 
     List<TabHaobanStaff> listByIds(@Param("staffIds") List<String> staffIds);
 
-    List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId);
+    List<TabHaobanStaff> listByWxUserId(@Param("wxUserId") String wxUserId,@Param("wxEnterpriseId") String wxEnterpriseId);
 
     List<TabHaobanStaff> listLikeName(@Param("staffName") String staffName, @Param("wxEnterpriseId") String wxEnterpriseId);
 

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

@@ -18,7 +18,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
 
     int updateByPrimaryKeySelective(TabHaobanExternalClerkRelated record);
 
-    TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId, @Param("externalUserId") String externalUserId);
+    TabHaobanExternalClerkRelated selectByClerkIdAndExternalUserId(@Param("clerkId") String clerkId,
+                                                                   @Param("externalUserId") String externalUserId);
 
     void delByUserIdAndExternalUserId(TabHaobanExternalClerkRelated record);
 

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

@@ -69,7 +69,13 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
     public void delByUserIdAndExternalUserId(MemberUnionidRelatedDTO dto) {
         mapper.delByUserIdAndExternalUserId(EntityUtil.changeEntityByJSON(TabHaobanExternalClerkRelated.class, dto));
         String wxUserId = dto.getWxUserId();
-        List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxUserId(wxUserId);
+        String externalUserid = dto.getExternalUserid();
+        List<TabHaobanExternalClerkRelated> tabHaobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 2);
+        if (CollectionUtils.isEmpty(tabHaobanExternalClerkRelatedList)) {
+            logger.info("无解除的好友关系：externalUserid:{},wxUserId:{}", externalUserid, wxUserId);
+            return;
+        }
+        List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxUserId(wxUserId, tabHaobanExternalClerkRelatedList.get(0).getWxEnterpriseId());
         if (CollectionUtils.isEmpty(tabHaobanStaffs)) {
             logger.error("找不到员工:wxUserId:{}", wxUserId);
             return;
@@ -147,7 +153,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
 
     @Override
     public List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
-        return mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId,1);
+        return mapper.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, 1);
     }
 
     @Override

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

@@ -1112,8 +1112,8 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public List<StaffDTO> listByWxUserId(String wxUserId) {
-        List<TabHaobanStaff> list = staffMapper.listByWxUserId(wxUserId);
+    public List<StaffDTO> listByWxUserId(String wxUserId,String wxEnterpriseId) {
+        List<TabHaobanStaff> list = staffMapper.listByWxUserId(wxUserId,wxEnterpriseId);
         return EntityUtil.changeEntityListByJSON(StaffDTO.class, list);
     }
 

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

@@ -305,9 +305,9 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_staff
-        where status_flag = 1
-        <if test="wxUserId != null">
-            and wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+        where status_flag = 1 and wx_user_id = #{wxUserId,jdbcType=VARCHAR}
+        <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
+            and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         </if>
     </select>
 

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

@@ -314,7 +314,7 @@
         and status_flag = 1
     </select>
 
-    <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap" parameterType="java.lang.String">
+    <select id="listByExTernalUseridAndWxUserId" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related

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

@@ -141,10 +141,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
             DictDTO loginUserId = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getPhoneNumber());
             logger.info("伪登录：{}，userId:{}", loginStaff.getPhoneNumber(), JSONObject.toJSONString(loginUserId));
             if (null != loginUserId) {
-                String val = loginUserId.getDictValue();
+                String dictValue = loginUserId.getDictValue();
                 List<StaffDTO> staffDTOS = new ArrayList<>();
-                List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(val);
-                List<StaffDTO> userDtos = staffApiService.listByWxUserId(val);
+                List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue);
+                List<StaffDTO> userDtos = staffApiService.listByWxUserId(dictValue,loginStaff.getWxEnterpriseId());
                 if (CollectionUtils.isNotEmpty(phoneDtos)) {
                     staffDTOS.addAll(phoneDtos);
                 }