|
|
@@ -718,8 +718,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
if (in.getSpecially()==3){
|
|
|
- if (TokenManager.hasRole(AFTConstants.CED))params.put("manageType",0);
|
|
|
- else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR))params.put("manageType",1);
|
|
|
+ if (TokenManager.hasRole(AFTConstants.CED)){
|
|
|
+ params.put("manageType",0);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
|
|
|
+ params.put("manageType",1);
|
|
|
+ }else {
|
|
|
+ params.put("manageType",0);
|
|
|
+ }
|
|
|
}
|
|
|
params.put("specially", in.getSpecially());
|
|
|
if (StringUtils.isNotBlank(in.getName())) {
|
|
|
@@ -873,7 +878,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//如果是转的暂时不删除外包信息
|
|
|
aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
|
|
|
} else if(outsource==1) {
|
|
|
- for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
|
|
|
aids.add(admin.getId());
|
|
|
}
|
|
|
t.setProcessStatus(ProcessStatus.YPWBSH.getCode());
|
|
|
@@ -1214,7 +1219,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
|
|
|
t.setFinanceId(oo.getFinanceId());
|
|
|
- for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleNameList("咨询师管理员")) {
|
|
|
aids.add(admin.getId());
|
|
|
}
|
|
|
type=NoticeStatus.ORDER_APPROVA_YES.getCode();
|
|
|
@@ -1615,7 +1620,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
if (o.getStartType()==0) {
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
- for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
|
|
|
aids.add(admin.getId());
|
|
|
}
|
|
|
TOrderNew t2= checkDeleteSign(o.getOrderNo());
|