|
|
@@ -18,48 +18,49 @@ public class PushOrderService {
|
|
|
private AdminMapper adminMapper;
|
|
|
|
|
|
public String ShiroConstant(String url,String aid,Integer approval,String orderDep){
|
|
|
- if (StringUtils.isNotNull(url)){
|
|
|
- if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
|
|
|
- TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
|
|
|
+ if (StringUtils.isNotNull(url)) {
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
|
|
|
+ TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE) || TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)) {
|
|
|
return url;
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.CED)){
|
|
|
- if (approval==1){
|
|
|
+ } else if (TokenManager.hasRole(AFTConstants.CED)) {
|
|
|
+ if (approval == 1) {
|
|
|
return url;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return url;
|
|
|
}
|
|
|
- }else if(TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
- String depId=adminMapper.getFinanceDep(TokenManager.getAdminId());
|
|
|
- if (orderDep.equals(depId)){
|
|
|
+ } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
+ String depId = adminMapper.getFinanceDep(TokenManager.getAdminId());
|
|
|
+ if (orderDep.equals(depId)) {
|
|
|
return url;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return DEFAULTS_URL;
|
|
|
}
|
|
|
- }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
- List<String> deps=adminMapper.getLowerFinanceDep(TokenManager.getAdminId());
|
|
|
- boolean flag=false;
|
|
|
+ } else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
+ List<String> deps = adminMapper.getLowerFinanceDep(TokenManager.getAdminId());
|
|
|
+ boolean flag = false;
|
|
|
for (String dep : deps) {
|
|
|
- if (orderDep.equals(deps)){
|
|
|
- flag=true;
|
|
|
+ if (orderDep.equals(deps)) {
|
|
|
+ flag = true;
|
|
|
break;
|
|
|
}
|
|
|
- if (flag){
|
|
|
+ if (flag) {
|
|
|
return url;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return DEFAULTS_URL;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
- } else if (TokenManager.hasRole(AFTConstants.SALESMAN)){
|
|
|
- if (TokenManager.getAdminId().equals(aid)){
|
|
|
+ } else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
|
|
|
+ if (TokenManager.getAdminId().equals(aid)) {
|
|
|
return url;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return DEFAULTS_URL;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ return DEFAULTS_URL;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- return DEFAULTS_URL;
|
|
|
+ return null;
|
|
|
}
|
|
|
}
|