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

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

@@ -8,7 +8,6 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
@@ -89,7 +88,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), channelCode, clerkRelation.getStaffClerkRelationId());
 
             //废弃活码
-            hmClerkRelationApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(),clerkRelation.getWxEnterpriseId(), channelCode);
+            hmClerkRelationApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(), clerkRelation.getWxEnterpriseId(), channelCode);
         }
         return b;
     }
@@ -117,7 +116,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
         for (TabHaobanStaffClerkRelation clerkRelation : needUnbind) {
             //废弃活码
-            hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), clerkRelation.getEnterpriseId(),wxEnterpriseId,chanelCode);
+            hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), clerkRelation.getEnterpriseId(), wxEnterpriseId, chanelCode);
         }
         return true;
     }
@@ -261,12 +260,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 
     @Override
     public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId , null));
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, null));
     }
-    
+
     @Override
     public List<StaffClerkRelationDTO> listByStaffId(String wxEnterpriseId, String staffId, List<String> storeIdList) {
-        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId , storeIdList));
+        return EntityUtil.changeEntityListByJSON(StaffClerkRelationDTO.class, mapper.lisByStaffId(wxEnterpriseId, staffId, storeIdList));
     }
 
     @Override
@@ -320,7 +319,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if (CollectionUtils.isEmpty(clerkList)) {
             return null;
         }
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         if (qwDTO.needOpenUserId3th()) {
             return mapper.listWxOpenUserIdByClerkIds(clerkList, wxEnterpriseId);
         }
@@ -332,9 +331,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if (CollectionUtils.isEmpty(wxUserIds)) {
             return null;
         }
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        String corpid = wxEnterpriseDTO.getCorpid();
-        if (corpid.length() > 20) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        if (qwDTO.needOpenUserId3th()) {
             return mapper.listIdsByWxOpenUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
         }
         return mapper.listIdsByWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
@@ -345,9 +343,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if (CollectionUtils.isEmpty(wxUserIds)) {
             return null;
         }
-        WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        String corpid = wxEnterpriseDTO.getCorpid();
-        if (corpid.length() > 20) {
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        if (qwDTO.needOpenUserId3th()) {
             return mapper.listIdsByNotInWxOpenUserIds(wxUserIds, wxEnterpriseId, enterpriseId);
         }
         return mapper.listIdsByNotInWxUserIds(wxUserIds, wxEnterpriseId, enterpriseId);

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

@@ -476,7 +476,7 @@
         a.store_id storeId,
         a.wx_enterprise_id wxEnterpriseId,
         a.enterprise_id enterpriseId,
-        a.wx_user_id wxUserId,
+        b.wx_user_id wxUserId,
         a.staff_id staffId,
         a.clerk_id clerkId,
         b.staff_name staffName,
@@ -531,7 +531,7 @@
         a.store_id storeId,
         a.wx_enterprise_id wxEnterpriseId,
         a.enterprise_id enterpriseId,
-        a.wx_user_id wxUserId,
+        b.wx_user_id wxUserId,
         a.staff_id staffId,
         a.clerk_id clerkId,
         b.staff_name staffName,