|
|
@@ -551,10 +551,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
prd.setDuration(duration);
|
|
|
}
|
|
|
index++;
|
|
|
- if (!use.getAid().equals(u.getAid())){
|
|
|
- addPublicExamine(use.getId(), u.getAid());
|
|
|
- if (publicType==1)publicType=1;
|
|
|
+ //修改公出判定是否需要他人审核
|
|
|
+ //先只有业务公出才有,再看是否是业务员,再看是否是限定客户
|
|
|
+ if (in.getType()==null)in.setType(use.getType());
|
|
|
+ if (in.getType()==0){
|
|
|
+ AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
+ if (my.getPublicPurview()==0){
|
|
|
+ int countRestrictProject = userMapper.getCountRestrictProject(u.getId(), my.getId());
|
|
|
+ if (countRestrictProject==0){
|
|
|
+ if (!use.getAid().equals(u.getAid())){
|
|
|
+ addPublicExamine(use.getId(), u.getAid());
|
|
|
+ if (publicType==1)publicType=1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}else {
|
|
|
InputPublicRelease inp=new InputPublicRelease();
|
|
|
inp.setId(in.getId());
|