|
|
@@ -88,6 +88,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
Map checkOrderNo =null;
|
|
|
if (in.getType() == 1) {
|
|
|
+ //技术公出
|
|
|
checkOrderNo = checkOrderNoDuration(in,my,1);
|
|
|
boolean isValid = (boolean) checkOrderNo.get("code");
|
|
|
if (isValid){
|
|
|
@@ -219,23 +220,27 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//不是业务员
|
|
|
if (in.getType()==0){
|
|
|
if (my.getPublicPurview()==0){
|
|
|
- users.forEach(u->{
|
|
|
- if (!u.getAid().equals(my.getId())){
|
|
|
- StringBuffer str2=new StringBuffer();
|
|
|
- str2=str2.append(my.getName()).append("(需审核),准备公出您的企业");
|
|
|
- str2=str2.append("[").append(u.getNickname()).append("]!!!。");
|
|
|
- sendEmailAndNoticeAndSoucket(u.getAid(),3,str2.toString());
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
|
|
|
- if (in.getType()==0){
|
|
|
- //不是自己的企业则需要审核并设置非自己客户待审核
|
|
|
- addPublicExamine(in.getId(), admin);
|
|
|
- if(in.getPublicType()==null|| in.getPublicType()==0)in.setPublicType(1);
|
|
|
- }
|
|
|
- pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
|
|
|
- status.set(0);
|
|
|
- }
|
|
|
- });
|
|
|
- }else {
|
|
|
+ for (User u : users) {
|
|
|
+ if (!u.getAid().equals(my.getId())) {
|
|
|
+ StringBuffer str2 = new StringBuffer();
|
|
|
+ str2 = str2.append(my.getName()).append("(需审核),准备公出您的企业");
|
|
|
+ str2 = str2.append("[").append(u.getNickname()).append("]!!!。");
|
|
|
+ sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
|
|
|
+ if (in.getType() == 0) {
|
|
|
+ //不是自己的企业则需要审核并设置非自己客户待审核
|
|
|
+ //新增限定项目逻辑,如果是我的限定项目,则可以公出,不是则需要审核
|
|
|
+ int countRestrictProject = userMapper.getCountRestrictProject(u.getId(), my.getId());
|
|
|
+ if (countRestrictProject==0){
|
|
|
+ addPublicExamine(in.getId(), admin);
|
|
|
+ if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
|
|
|
+ status.set(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else {
|
|
|
users.forEach(u->{
|
|
|
if (!u.getAid().equals(my.getId())){
|
|
|
StringBuffer str2=new StringBuffer();
|