通讯录

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

@@ -151,33 +151,34 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
     }
 
     private void getStaff(String taskId, String dataId, String enterpriseId, String wxEnterpriseId,SecretSettingDTO secretSetting,WxEnterpriseQwDTO qwDTO) {
-        List<UserDTO> list = null ;
-        if(qwDTO.getWxSecurityType()==4) {
-            list = this.qywxUserApiService.listDepartmentUser(qwDTO.getThirdCorpid(), config.getWxSuiteid(),  dataId, 0) ;
-            logger.info("从(第三方)获取通讯录={}",JSON.toJSONString(list)) ;
-        }else {
-            list = this.qywxUserApiService.listSelfDepartmentUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), dataId, 0,qwDTO.getUrlHost());
-            logger.info("从(代开)获取通讯录={}",JSON.toJSONString(list)) ;
-        }
-        if (null == list) {
-            logger.info("微信获取部门成员异常：{},{}", taskId, dataId);
-            return;
+        if("1".equals(dataId)) {
+            List<UserDTO> list = null ;
+            if(qwDTO.getWxSecurityType()==4) {
+                list = this.qywxUserApiService.listDepartmentUser(qwDTO.getThirdCorpid(), config.getWxSuiteid(),  dataId, 1) ;
+                logger.info("从(第三方)获取通讯录={}",JSON.toJSONString(list)) ;
+            }else {
+                list = this.qywxUserApiService.listSelfDepartmentUser(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), dataId, 1,qwDTO.getUrlHost());
+                logger.info("从(代开)获取通讯录={}",JSON.toJSONString(list)) ;
+            }
+            if (null == list) {
+                logger.info("微信获取部门成员异常：{},{}", taskId, dataId);
+                return;
+            }
+            logger.info("拉取成员数={},taskId={}",list.size(),taskId);
+            List<TabHaobanPreDealLog> preDealLogList = list.stream().map(userDTO -> {
+                TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+                dealLog.setDataId(userDTO.getUserid());
+                dealLog.setpDataId(dataId);
+                dealLog.setDataType(PreDealTypeEnum.clerk.getVal());
+                dealLog.setStatusFlag(0);
+                dealLog.setDataContent(EmojiFilterUtil.removeAllEmoji(userDTO.getName()));
+                dealLog.setTaskId(taskId);
+                dealLog.setWxEnterpriseId(wxEnterpriseId);
+                dealLog.setEnterpriseId(enterpriseId);
+                return dealLog;
+            }).collect(Collectors.toList());
+            this.preDealService.insert(preDealLogList);
         }
-        logger.info("拉取成员数={},部门={}",list.size(),dataId);
-        //List<String> dataList = preDealService.listDataIdByTaskIdAndDataType(taskId, PreDealTypeEnum.clerk.getVal());
-        List<TabHaobanPreDealLog> preDealLogList = list.stream().map(userDTO -> {
-            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
-            dealLog.setDataId(userDTO.getUserid());
-            dealLog.setpDataId(dataId);
-            dealLog.setDataType(PreDealTypeEnum.clerk.getVal());
-            dealLog.setStatusFlag(0);
-            dealLog.setDataContent(EmojiFilterUtil.removeAllEmoji(userDTO.getName()));
-            dealLog.setTaskId(taskId);
-            dealLog.setWxEnterpriseId(wxEnterpriseId);
-            dealLog.setEnterpriseId(enterpriseId);
-            return dealLog;
-        }).collect(Collectors.toList());
-        this.preDealService.insert(preDealLogList);
     }
     @Override
     public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {