|
|
@@ -1681,6 +1681,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ //判定是否是可审核状态
|
|
|
+
|
|
|
//添加协单审核人可以查看
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
for (PublicRelease e : publicReleases) {
|
|
|
@@ -1711,7 +1713,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else {
|
|
|
out.setViewPermission(0);
|
|
|
}
|
|
|
- //非自己的客户审核
|
|
|
+ //公出非自己的客户审核列表
|
|
|
if (!ps.isEmpty()){
|
|
|
for (PublicExamine p : ps) {
|
|
|
if (p.getAid().equals(aid)){
|
|
|
@@ -1727,18 +1729,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
out=null;
|
|
|
return out;
|
|
|
}else {
|
|
|
- if (out.getPublicType()==1){
|
|
|
- if (aid.equals(out.getAid())){
|
|
|
- out.setPermission(0);
|
|
|
- }else {
|
|
|
- out.setPermission(1);
|
|
|
- }
|
|
|
+ if(aid.equals(out.getAid())) {
|
|
|
+ out.setPermission(0);
|
|
|
}else {
|
|
|
- if(aid.equals(out.getAid())) {
|
|
|
- out.setPermission(0);
|
|
|
- }else {
|
|
|
- out.setPermission(1);
|
|
|
- }
|
|
|
+ out.setPermission(1);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1748,6 +1742,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
|
|
|
pushDateClockDetailsToday(prdList,prdcList);
|
|
|
out.setPrdList(prdList);
|
|
|
+ //判定公出协单意见有没有的权限
|
|
|
List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(out.getId(), 0);
|
|
|
if (publicAssistAdvices.isEmpty()){
|
|
|
out.setPublicAssistAdvice(0);
|