|
|
@@ -1117,7 +1117,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
if (str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
- }else if ((e.getType()==0||e.getType()>4)&&e.getAssistProcess()==2){
|
|
|
+ }else if ((e.getType()==0||e.getType()>4)&&(e.getAssistProcess()==2||e.getAssistProcess()==3)){
|
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
@@ -2289,7 +2289,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
|
|
|
list.add(outPublicReleaseLog);
|
|
|
}
|
|
|
- }else if ((e.getType()==0||e.getType()==5)&&e.getAssistProcess()==2){
|
|
|
+ }else if ((e.getType()==0||e.getType()==5)&&(e.getAssistProcess()==2||e.getAssistProcess()==3)){
|
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
|
|
|
StringBuffer str =new StringBuffer();
|