修改BUG

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java

@@ -776,7 +776,7 @@ public class BLessonServiceImpl implements BLessonService {
             userIds.addAll(new ArrayList<>(userIdSet));
 
             //发送通知的人员集合
-            List<String> noticePersonList = userIds;
+            List<String> noticePersonList = new ArrayList<>(userIds);
 
             BAppoint bAppoint;
             //拼接人员和部门中人员

src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java

@@ -29,13 +29,9 @@ public interface MicroappFeignClient {
     /**
      * 批量查询
      * @param haveJurisdictionReqDTO
-     * @param zxClientType
-     * @param zxAccountId
      * @return
      */
     @RequestMapping(value = "/micro_app/haveJurisdictionUser",method = RequestMethod.POST)
-    Ret haveJurisdictionUser(@RequestParam("haveJurisdictionReqDTO") HaveJurisdictionReqDTO haveJurisdictionReqDTO,
-                   @RequestParam("zxClientType") String zxClientType,
-                   @RequestParam("zxAccountId") Long zxAccountId);
+    Ret haveJurisdictionUser(@RequestParam("haveJurisdictionReqDTO") HaveJurisdictionReqDTO haveJurisdictionReqDTO);
 
 }

src/main/java/org/rcisoft/common/util/feignDto/MTUserGetsReqDTO.java

 package org.rcisoft.common.util.feignDto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class MTUserGetsReqDTO {
 
     private String corpId;

src/main/java/org/rcisoft/common/util/outClient/MTMicroappApiRequestClient.java

@@ -39,8 +39,8 @@ public class MTMicroappApiRequestClient {
     }
 
     public Ret haveJurisdictionUser(HaveJurisdictionReqDTO haveJurisdictionReqDTO) {
-        haveJurisdictionReqDTO.setAppId(appId);
-        Ret ret = microappFeignClient.haveJurisdictionUser(haveJurisdictionReqDTO,zxClientType,zxAccountId);
+        haveJurisdictionReqDTO.setAppId((long)2);
+        Ret ret = microappFeignClient.haveJurisdictionUser(haveJurisdictionReqDTO);
         return ret;
     }
 

src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java

@@ -11,15 +11,12 @@ import org.rcisoft.business.bmessage.entity.BMessage;
 import org.rcisoft.business.bnotice.entity.BNotice;
 import org.rcisoft.business.bnotice.service.BNoticeService;
 import org.rcisoft.common.model.InfoTypeEnum;
-import org.rcisoft.common.util.feignDto.HaveJurisdictionReqDTO;
+import org.rcisoft.common.util.feignDto.*;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.NotiRet;
 import org.rcisoft.core.result.ResultCode;
 import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignClient.NotificationFeignClient;
-import org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO;
-import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
-import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
 import org.rcisoft.core.util.UrlUtil;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.dept.dao.SysDeptRepository;
@@ -87,9 +84,9 @@ public class MTNotificationApiRequestClient {
      * @return
      */
     public boolean send(BNotice message, String noticeTitle, String type, String urlType) {
-//        if(true) {
-//            return true;
-//        }
+        if(true) {
+            return true;
+        }
         NotiRet ret = new NotiRet();
 //        List<BNotice> bNoticeList = new ArrayList<>();
 
@@ -137,9 +134,11 @@ public class MTNotificationApiRequestClient {
             HaveJurisdictionReqDTO haveJurisdictionReqDTO = new HaveJurisdictionReqDTO(Long.parseLong(message.getCorpId()),recipientIdLongList);
             Ret haveJurisList =  microappApiRequestClient.haveJurisdictionUser(haveJurisdictionReqDTO);
             List<String> haveJurisAccountIds = new ArrayList<>();
-
-            //
-
+            MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO(message.getCorpId(),(List<String>)haveJurisList.getData());
+            List<MTAccountIdRspDTO> mtAccountIdRspDTOList = mtCotactApiRequestClient.accountGetUserHead(mtUserGetsReqDTO);
+            mtAccountIdRspDTOList.forEach(mtAccountIdRspDTO -> {
+                haveJurisAccountIds.add(mtAccountIdRspDTO.getAccountId());
+            });
             // 发送智信通知
             MTNotificationSendReqDTO mtNotificationSendReqDTO = MTNotificationSendReqDTO.builder().content(message.getInfoText())
                             .channels("ALL").receiverIds(haveJurisAccountIds).build();