|
@@ -97,8 +97,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
prd.setMainStatus(1);
|
|
prd.setMainStatus(1);
|
|
|
}else {
|
|
}else {
|
|
|
prd.setMainStatus(0);
|
|
prd.setMainStatus(0);
|
|
|
- //不是自己的企业则需要审核
|
|
|
|
|
|
|
+ //不是自己的企业则需要审核并设置非自己客户待审核
|
|
|
addPublicExamine(in.getId(),u.getAid());
|
|
addPublicExamine(in.getId(),u.getAid());
|
|
|
|
|
+ if(in.getPublicType()==0)in.setPublicType(1);
|
|
|
}
|
|
}
|
|
|
prd.setPrid(in.getId());
|
|
prd.setPrid(in.getId());
|
|
|
prd.setUid(s);
|
|
prd.setUid(s);
|
|
@@ -126,6 +127,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
PublicRelease upName=new PublicRelease();
|
|
PublicRelease upName=new PublicRelease();
|
|
|
upName.setId(in.getId());
|
|
upName.setId(in.getId());
|
|
|
upName.setUserNames(userNames);
|
|
upName.setUserNames(userNames);
|
|
|
|
|
+ if (in.getPublicType()==1){
|
|
|
|
|
+ upName.setPublicType(1);
|
|
|
|
|
+ }
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(upName);
|
|
publicReleaseMapper.updateByPrimaryKeySelective(upName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
Map<String, Object> map=addPublicReleaseLog(my, in,userNames,date);
|
|
Map<String, Object> map=addPublicReleaseLog(my, in,userNames,date);
|