|
|
@@ -204,7 +204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
|
- params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
+
|
|
|
if (null!=specially) params.put("specially", specially);
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
@@ -217,7 +217,23 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
params.put("outsource", outsource==null?0:outsource);
|
|
|
if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
|
|
|
-
|
|
|
+ List<String> fids=new ArrayList<>();
|
|
|
+ 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);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
+ params.put("role", 1);
|
|
|
+ fids =adminMapper.selectBySuperId(TokenManager.getAdminId());
|
|
|
+ params.put("fids",fids);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
|
|
|
+ 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, pageNo, pageSize);
|
|
|
List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
|
|
|
for (TOrderTaskListBo t : list) {
|