Browse Source

离职一键专辑客户时间修改成重置

anderx 7 months ago
parent
commit
2c61ff921a

+ 17 - 8
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.goafanti.customer.service.impl;
 
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.userDaysBo;
@@ -115,9 +116,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private RestrictProjectMapper restrictProjectMapper;
 	@Resource
 	private	AsyncUtils asyncUtils;
-
 	@Resource
 	private UserReceiveLogMapper userReceiveLogMapper;
+	@Resource
+	private AdminPublicReviewerMapper adminPublicReviewerMapper;
 
 
 
@@ -1441,13 +1443,20 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				pr.setId(e.getId());
 				pr.setPublicType(0);
 				publicReleaseMapper.update(pr);
-				Admin sendAdmin=adminMapper.selectById(admin.getReviewer());
-				noticeAid=sendAdmin.getId();
-				logStatus=2;
-				logMsg="转交客户到发起公出审核人,自动审核通过。";
-				pe.setAid(sendAdmin.getId());
-				pe.setAname(sendAdmin.getName());
-				pe.setCreateTime(new Date());
+				List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(admin.getId());
+				//提取type=0的数据
+					Admin sendAdmin=adminMapper.selectById(admin.getReviewer());
+//				noticeAid=sendAdmin.getId();
+				List<AdminPublicReviewerBo> adminPublicReviewerBos0 = adminPublicReviewerBos.stream().filter(e1 -> e1.getType().equals(0)).collect(Collectors.toList());
+				if (adminPublicReviewerBos0.size()>0){
+					for (AdminPublicReviewerBo e2 : adminPublicReviewerBos0) {
+						logStatus=2;
+						logMsg="转交客户到发起公出审核人,自动审核通过。";
+						pe.setAid(e2.getReviewerId());
+						pe.setAname(e2.getReviewerName());
+						pe.setCreateTime(new Date());
+					}
+				}
 			}else {
 				//与发起者不一致的就需要修改审核人员
 				pe.setAid(aid);