Просмотр исходного кода

营销员可查看自己变更流程下的图片

anderx лет назад: 4
Родитель
Сommit
a61f836e4b

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

@@ -252,7 +252,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setConsultantExamine(consultantExamine);
 			noc.setManagerExamine(managerExamine);
 			if (noc.getVoucherUrl()!=null) {
-				noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),noc.getProcessState(),noc.getStatus()));
+				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
+				noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
 			}
 			noc.setIsExamine(isExamine);
 		}
@@ -268,7 +269,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		nb.setManagerExamine(managerExamine);
 		nb.setIsExamine(isExamine);
 		if(nb.getProcessState()!=null){
-			nb.setVoucherUrl(pushOrderService.changeProcessStatusConstant(nb.getVoucherUrl(),nb.getProcessState(),nb.getStatus()));
+			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
+			nb.setVoucherUrl(pushOrderService.changeProcessStatusConstant(nb.getVoucherUrl(),t.getSalesmanId(),nb.getProcessState(),nb.getStatus()));
 		}
 		return nb;
 	}

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

@@ -15,73 +15,9 @@ import java.util.List;
 
 @Service
 public class PushOrderService {
-    public static String   DEFAULTS_URL="/image/noPermission.jpg";
+    public static final String   DEFAULTS_URL="/image/noPermission.jpg";
 
-    @Autowired
-    private AdminMapper adminMapper;
 
-    /**
-     * 根据角色判断是否可以查看合同图片
-     * @param url 合同地址
-     * @param aid 营销id
-     * @param approval 特批
-     * @param orderDep 订单编号
-     * @return
-     */
-    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)
-            || TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)|| TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
-                return url;
-            } else if (TokenManager.hasRole(AFTConstants.CED)) {
-                if (approval == 1) {
-                    return url;
-                } else {
-                    return url;
-                }
-            } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
-                List<String> deps = adminMapper.getFinanceDep(TokenManager.getAdminId());
-                boolean flag = false;
-                for (String dep : deps) {
-                    if (dep.equals(orderDep)) {
-                        flag = true;
-                        break;
-                    }
-                }
-                if (flag) {
-                    return url;
-                } else {
-                    return DEFAULTS_URL;
-                }
-
-            } 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;
-                        break;
-                    }
-                }
-                if (flag) {
-                    return url;
-                } else {
-                    return DEFAULTS_URL;
-                }
-            } else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
-                if (TokenManager.getAdminId().equals(aid)) {
-                    return url;
-                } else {
-                    return DEFAULTS_URL;
-                }
-            } else {
-                return DEFAULTS_URL;
-            }
-        }
-        return null;
-    }
 
     /**
      * 根据流程与角色判断是否可以查看订单合同
@@ -118,19 +54,16 @@ public class PushOrderService {
      * @param status 在流程走完则要财务退票 状态 0草稿 1审核中 2通过 3驳回 4完成 5撤销 2是流程走完但是还停留在财务退票,4才是完全走完流程
      * @return
      */
-    public String changeProcessStatusConstant(String url,Integer processStatus,Integer status){
+    public String changeProcessStatusConstant(String url,String aid,Integer processStatus,Integer status){
         boolean flag=false;
         //流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
                 TokenManager.hasRole(AFTConstants.CED) ){
             flag=true;
+        } else  if(TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+            flag=true;
         }else{
             switch (processStatus) {
-                case 0:
-                    if(TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
-                        flag=true;
-                    }
-                    break;
                 case 1:
                     if(TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
                         flag=true;