소스 검색

订单详情列表修改

anderx 2 년 전
부모
커밋
b4ed9df12f
1개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. 9 9
      src/main/java/com/goafanti/order/service/impl/PushOrderService.java

+ 9 - 9
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -29,17 +29,10 @@ public class PushOrderService {
     public String processStatusConstant(TOrderNewBo t){
         //tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus(),tOrder.getApproval()
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
+
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
             return t.getContractPictureUrl();
-        }else if(t.getApproval()==ApprovalNewState.TPDSH.getCode()){
-            Department department = departmentMapper.selectByPrimaryKey(t.getOrderDep());
-            if (department.getApproval()==1&&department.getApprovalAid().equals(TokenManager.getAdminId())){
-                return  t.getContractPictureUrl();
-            }
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN)&&
-                TokenManager.getAdminId().equals(t.getSalesmanId())){
-            return  t.getContractPictureUrl();
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&&
+        }else if ((TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN))&&
                 TokenManager.getAdminId().equals(t.getSalesmanId())){
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)&& !TokenManager.getAdminId().equals(t.getSalesmanId())){
@@ -59,10 +52,17 @@ public class PushOrderService {
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();
         }
+        if(t.getApproval()== ApprovalNewState.TPDSH.getCode()){
+            Department department = departmentMapper.selectByPrimaryKey(t.getOrderDep());
+            if (department.getApproval()==1&&department.getApprovalAid().equals(TokenManager.getAdminId())){
+                return  t.getContractPictureUrl();
+            }
+        }
             return DEFAULTS_URL;
     }
 
 
+
     /**
      * 根据变更流程判断是否可以查看
      *