Browse Source

Merge branch 'test'

anderx 2 years ago
parent
commit
23af54ef0f

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

@@ -399,7 +399,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (ib.getOutsourceStatus() !=null) params.put("outsourceStatus", ib.getOutsourceStatus());
 		if (ib.getCid() !=null) params.put("cid", ib.getCid());
 		List<String> fids=new ArrayList<>();
-		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+		 if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)){
+			params.put("role", 0);
+			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN) ||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
 				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
 				TokenManager.hasRole(AFTConstants.VICE_CEO)) {
 			params.put("role", 2);
@@ -411,9 +414,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			params.put("role", 1);
 			 fids.add(TokenManager.getAdminId());
 			 params.put("fids",fids);
-		} else {
-			params.put("role", 0);
-			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		}
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, ib.getPageNo(), ib.getPageSize());
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();