Explorar el Código

修改公出详情查看权限,新增技术发起审核查看权限

anderx hace 1 año
padre
commit
9065bc0479

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

@@ -548,7 +548,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
 		Map<String,Object> map =new HashMap<String, Object>();
-		map.put("type", in.getType()==null?0:in.getType());
+//		map.put("type", in.getType()==null?0:in.getType());
+		map.put("type", 5);
 		if (in.getType()==3) {
 			in.setAssist(2);
 			if (!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR))map.put("aid",TokenManager.getAdminId());
@@ -1087,6 +1088,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		OutPublicRelease out=publicReleaseMapper.selectDtails(id);
 		List<PublicExamine> ps = publicExamineMapper.selectByPrid(out.getId());
 		out.setPeList(ps);
+
 		if(out!=null){
 			boolean flag=false;
 			//自己、审核人员与部门负责人可以查看
@@ -1097,6 +1099,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					!TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
 				flag=true;
 			}
+			//技术发起审核可以看
+			if (out.getTechStartProcess()!=0){
+				TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(out.getOrderNo());
+				if (tOrderNew.getSalesmanId().equals(aid)){
+					flag=true;
+				}
+			}
 			//是否可以查看
 			if (!ps.isEmpty()){
 				for (PublicExamine p : ps) {