|
|
@@ -229,7 +229,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("outsource", outsource==null?0:outsource);
|
|
|
if (null!=specially) params.put("specially", specially);
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
@@ -242,7 +242,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (StringUtils.isNotBlank(startSignTime)) params.put("startSignTime", startSignTime);
|
|
|
if (StringUtils.isNotBlank(endSignTime)) params.put("endSignTime", endSignTime);
|
|
|
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)||
|