Merge branch 'fixbug_0921' into developer

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

@@ -19,7 +19,6 @@ import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.pojo.QywxSyncTagFormatPojo;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.QywxTagService;
-import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.member.api.dto.MemberTagDTO;
 import com.gic.member.api.service.MemberTagService;
@@ -86,8 +85,6 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
     @Autowired
     private MemberTagItemApiService memberTagItemApiService;
-    @Autowired
-    private StaffService staffService;
 
     @Override
     public void pullQywxTag(String wxEnterpriseId) {
@@ -691,13 +688,6 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         for (int i = 0; i < followUser.size(); i++) {
             JSONObject midUser = followUser.getJSONObject(i);
             String wxUserId = midUser.getString("userid");
-            //做兼容
-           /* TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-            if (staff != null) {
-                logger.info("旧wxUserId：{}", wxUserId);
-                wxUserId = staff.getWxUserId();
-                logger.info("新wxUserId：{}", wxUserId);
-            }*/
             Set<String> midTagIds = new HashSet<>();
             if (!midUser.containsKey("tags")) {
                 ret.put(wxUserId, midTagIds);