修改suitId

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

@@ -12,10 +12,7 @@ import com.gic.haoban.app.customer.service.api.service.InnerApiService;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.*;
-import com.gic.haoban.manage.api.enums.AppPageType;
-import com.gic.haoban.manage.api.enums.GicDataType;
-import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
-import com.gic.haoban.manage.api.enums.WxEditType;
+import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.config.Config;
@@ -90,6 +87,9 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private ClerkService clerkService;
 
+    @Autowired
+    private SecretSettingService secretSettingService;
+
     @Override
     public void gicMessageReceive(GicMessageDTO gicMessageDTO) {
         if (true) {
@@ -143,8 +143,13 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("添加企业员工失败:{}", response.getMessage());
             return;
         }
+        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(enterprise.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+        if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
+            log.info("没有配置secret：{}", JSONObject.toJSONString(enterprise));
+            return;
+        }
         // 取第一个企业的id
-        doDealUser(dto, relatedList.get(0).getEnterpriseId());
+        doDealUser(dto, relatedList.get(0).getEnterpriseId(), secretSetting.getSecretVal());
 
         // 以下暂时不会用到
 //        if (dto != null) {
@@ -184,11 +189,11 @@ public class MessageApiServiceImpl implements MessageApiService {
         return userid.startsWith("5");
     }
 
-    private void doDealUser(QywxCallBackDTO dto, String enterpriseId) {
+    private void doDealUser(QywxCallBackDTO dto, String enterpriseId, String secret) {
         ClerkQwDTO clerkQwDTO = new ClerkQwDTO();
         clerkQwDTO.setEnterpriseId(enterpriseId);
         String mainDeptId = dto.getMainDepartment();
-        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> departments = qywxDepartmentApiService.listDepartment(dto.getAuthCorpId(), config.getWxSuiteid(), Integer.valueOf(mainDeptId));
+        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> departments = qywxDepartmentApiService.listSelfDepartment(dto.getAuthCorpId(), secret, Integer.valueOf(mainDeptId));
         if (CollectionUtils.isEmpty(departments)) {
             log.info("通过主部门查询部门列表为空 mainDeptId:{}", mainDeptId);
             return;