anderx 1 год назад
Родитель
Сommit
1c69a1220e

+ 12 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1386,15 +1386,26 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		out.setPeList(ps);
 
 		if(out!=null){
+			//默认可以看
 			boolean flag=false;
 			//自己、审核人员与部门负责人可以查看
 			AdminListBo ab=adminMapper.getDeptNameByAid(out.getAid());
 			if (!aid.equals( out.getAid())&&
-					!aid.equals(out.getReviewer())&&
 					!aid.equals(ab.getDepManager())&&
 					!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 				flag=true;
 			}
+			//如果是协单,如果是审核人则可以查看
+			if(out.getType()==3){
+				List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
+				List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
+				for (AdminPublicReviewerBo e : collect) {
+					if (e.getReviewerId().equals(aid)){
+						flag=false;
+						break;
+					}
+				}
+			}
 			//是否可以审核
 			if (!ps.isEmpty()){
 				for (PublicExamine p : ps) {