Browse Source

会员通知消息BUG修复

anderx 1 year ago
parent
commit
ca232c1e59

+ 8 - 4
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1416,13 +1416,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public int pushExamineMemberProject(InputMenber in) {
 		TOrderTask task=tOrderTaskMapper.queryById(in.getId());
 		String aid=TokenManager.getAdminId();
-		Integer status=1;
+		int status=1;
 		boolean appFlag=false;
 		//是否财务审核加复审
 		boolean flag=false;
 		TOrderTask nt=new TOrderTask();
 		nt.setId(task.getId());
-		Integer result=0;
+		int result=0;
 		Integer notice=NoticeStatus.MENBER_YES.getCode();
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		TTaskMember tTaskMember = tTaskMemberMapper.selectByTid(in.getId());
@@ -1432,7 +1432,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (in.getType()==0){
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
 				List<TOrderExamine> list = tOrderExamineMapper.selectByTid(task.getId());
-				list.stream().forEach(e ->{
+				list.forEach(e ->{
 					if (e.getAid().equals(aid)){
 						TOrderExamine te=new TOrderExamine();
 						te.setId(e.getId());
@@ -1718,7 +1718,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				if (result==1) {
 					admins = MemberEnd(b);
 				}else{
-					admins=adminMapper.getAdminRoleTypeList(AFTConstants.CED);
+					//通知总裁改成特批审核人
+					//admins=adminMapper.getAdminRoleTypeList(AFTConstants.CED);
+					Department department = tOrderNewMapper.selectDepByOrderNo(b.getOrderNo());
+					//部门设置无需特批的情况下直接完成,否则走正常流程
+					admins.add(adminMapper.selectByPrimaryKey(department.getApprovalAid()));
 				}
 			} else if(shiroType==1){
 				sb=sb.append("特批已通过。");