|
|
@@ -373,6 +373,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// Admin a=adminMapper.selectById(my.getReviewer());
|
|
|
//订单审核换成多人
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
|
|
|
+ adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
//默认上级审核
|
|
|
AtomicReference<Integer> status= new AtomicReference<>(1);
|
|
|
@@ -481,6 +482,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param map 返回实体
|
|
|
*/
|
|
|
private void pushNoticeAndSoucketAndEmail(AdminListBo my, PublicRelease in, Date date, Admin a, String str, Map<String, Object> map) {
|
|
|
+ System.out.println("================================="+1);
|
|
|
sendNoticeAndSoucket(a.getId(),1, str);
|
|
|
if (a.getOpenId() !=null) {
|
|
|
Integer res= weChatUtils.addNotice(a.getOpenId(), in.getStatus(), in.getId(), date, my.getName(),"["+ my.getName()+"]发起外出申请");
|