Explorar o código

Merge branch 'test' of jishutao/kede-server into prod

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
5999af959b

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -832,8 +832,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
-		String url=pushOrderService.processStatusConstant(tOrder);
-		tOrder.setContractPictureUrl(url);
+		//设置合同查看权限
+		tOrder.setContractPictureUrl(pushOrderService.processStatusConstant(tOrder));
 		pushMyExamine(orderNo, tOrder);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||
 				tOrder.getSalesmanId().equals(TokenManager.getAdminId())) {

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

@@ -35,13 +35,15 @@ public class PushOrderService {
                 return  t.getContractPictureUrl();
             }
         }else if(TokenManager.hasRole(AFTConstants.VICE_CED)){
-            if (t.getApproval()== ApprovalNewState.FZCDSH.getCode()){
-                return  t.getContractPictureUrl();
-            }else  if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
-                return DEFAULTS_URL;
-            }else {
-                return  t.getContractPictureUrl();
+            if(t.getProcessStatus()== ProcessStatus.YPTPSH.getCode()){
+                if (t.getApproval()== ApprovalNewState.FZCDSH.getCode()){
+                    if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
+                        return DEFAULTS_URL;
+                    }
+                    return  t.getContractPictureUrl();
+                }
             }
+            return DEFAULTS_URL;
         }else if (TokenManager.hasRole(AFTConstants.SALESMAN)&&
                 TokenManager.getAdminId().equals(t.getSalesmanId())){
             return  t.getContractPictureUrl();