|
|
@@ -41,23 +41,23 @@ public class PushOrderService {
|
|
|
||TokenManager.hasRole(AFTConstants.SALESMAN_ASSISTANT))&&
|
|
|
Objects.equals(TokenManager.getAdminId(), t.getSalesmanId())){
|
|
|
return t.getContractPictureUrl();
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&& !TokenManager.getAdminId().equals(t.getSalesmanId())){
|
|
|
- if (TokenManager.getAdminId().equals(t.getManagerId())&&t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
|
|
|
+ }else if (t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
|
|
|
+ if (TokenManager.getAdminId().equals(t.getManagerId())){
|
|
|
return t.getContractPictureUrl();
|
|
|
}else {
|
|
|
return DEFAULTS_URL;
|
|
|
}
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
|
|
|
+ }else if (t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()&&TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
return t.getContractPictureUrl();
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&(t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode())){
|
|
|
+ }else if (t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()&&TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
return t.getContractPictureUrl();
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)&&(
|
|
|
- t.getProcessStatus()== ProcessStatus.YYBZSH.getCode()
|
|
|
- )){
|
|
|
+ }else if ((t.getProcessStatus()== ProcessStatus.YYBZSH.getCode())&&
|
|
|
+ TokenManager.hasRole(AFTConstants.OPERATION_GUARANTEE)
|
|
|
+ ){
|
|
|
return t.getContractPictureUrl();
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&(
|
|
|
- t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()
|
|
|
- )){
|
|
|
+ }else if ((t.getProcessStatus()== ProcessStatus.YPCW_JSZJ.getCode()||t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode())&&
|
|
|
+ TokenManager.hasRole(AFTConstants.TECH_ADMIN)
|
|
|
+ ){
|
|
|
return t.getContractPictureUrl();
|
|
|
}else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
|
|
|
return t.getContractPictureUrl();
|