|
|
@@ -777,9 +777,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (specially==null)specially=0;
|
|
|
params.put("specially", specially);
|
|
|
Integer i=null;
|
|
|
- if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
|
|
|
- params.put("aid", TokenManager.getAdminId());
|
|
|
- } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
i=1;
|
|
|
params.put("fid", TokenManager.getAdminId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
@@ -789,6 +787,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
|
|
|
TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
|
|
|
i=3;
|
|
|
+ }else {
|
|
|
+ params.put("aid", TokenManager.getAdminId());
|
|
|
}
|
|
|
if (specially==1){
|
|
|
params.put("aid", aid);
|
|
|
@@ -1370,14 +1370,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(in.gettStarTime())) params.put("tStarTime", in.gettStarTime());
|
|
|
if (StringUtils.isNotBlank(in.gettEndTime())) params.put("tEndTime", in.gettEndTime()+" 23:59:59");
|
|
|
Integer i=null;
|
|
|
- if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
|
|
|
- params.put("aid", TokenManager.getAdminId());
|
|
|
- } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
i=1;
|
|
|
params.put("fid", TokenManager.getAdminId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
i=2;
|
|
|
params.put("fid", TokenManager.getAdminId());
|
|
|
+ }else{
|
|
|
+ params.put("aid", TokenManager.getAdminId());
|
|
|
}
|
|
|
if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
|
|
|
TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
|