Browse Source

特批人员审核图片显示修改

anderx 2 years ago
parent
commit
84c231c86d

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

@@ -253,8 +253,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		int isExamine=orderExamineMapper.selectByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId());
 		nb.setIsExamine(isExamine);
 		if(nb.getProcessState()!=null){
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
-			nb.setVoucherUrl(pushOrderService.changeProcessStatusConstant(nb.getVoucherUrl(),t.getSalesmanId(),nb.getProcessState(),nb.getStatus()));
+
+			nb.setVoucherUrl(pushOrderService.changeProcessStatusConstant(nb.getVoucherUrl(),nb.getOrderNo(),nb.getProcessState(),nb.getStatus()));
 		}
 		return nb;
 	}

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

@@ -3,6 +3,7 @@ package com.goafanti.order.service.impl;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DepartmentMapper;
+import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.Department;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderNewBo;
@@ -16,6 +17,8 @@ public class PushOrderService {
     public static final String   DEFAULTS_URL="/image/noPermission.jpg";
     @Autowired
     private DepartmentMapper departmentMapper;
+    @Autowired
+    private TOrderNewMapper tOrderNewMapper;
 
 
 
@@ -70,7 +73,7 @@ public class PushOrderService {
      * @param status 在流程走完则要财务退票 状态 0草稿 1审核中 2通过 3驳回 4完成 5撤销 2是流程走完但是还停留在财务退票,4才是完全走完流程
      * @return
      */
-    public String changeProcessStatusConstant(String url,String aid,Integer processStatus,Integer status){
+    public String changeProcessStatusConstant(String url,String orderNo,Integer processStatus,Integer status){
         //流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
         boolean flag=false;
         //超级管理员、董事长、总裁、总裁助手可以看
@@ -114,9 +117,13 @@ public class PushOrderService {
                     }
                     break;
                 case 8:
-
-                    if((TokenManager.hasRole(AFTConstants.CED)&&status!=2)||
-                            (TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
+                    if(status==1){
+                        Department department = tOrderNewMapper.selectDepByOrderNo(orderNo);
+                        if (TokenManager.getAdminId().equals(department.getApprovalAid())){
+                            flag=true;
+                        }
+                    }
+                    if(TokenManager.hasRole(AFTConstants.FINANCE)&&status==2){
                         flag=true;
                     }
                     break;