|
|
@@ -1066,15 +1066,17 @@ 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;
|
|
|
- pushParams(params,"aid",TokenManager.getAdminId());
|
|
|
- pushParams(params,"name",name);
|
|
|
- pushParams(params,"orderNo",orderNo);
|
|
|
- pushParams(params,"taskId",taskId);
|
|
|
- pushParams(params,"taskStatus",taskStatus);
|
|
|
- pushParams(params,"depId",depId);
|
|
|
- pushParams(params,"thchId",thchId);
|
|
|
- pushParams(params,"adminName", adminName);
|
|
|
- pushParams(params,"type", type.split(","));
|
|
|
+ params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
|
|
|
+ if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
+ if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
+ if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
+ if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
|
|
|
+ if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
|
|
|
+ if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
|
|
|
+ if (null != taskStatus) params.put("taskStatus", taskStatus);
|
|
|
+ if (StringUtils.isNotBlank(type)){
|
|
|
+ params.put("type", type.split(","));
|
|
|
+ }
|
|
|
Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
|
|
|
return p;
|
|
|
}
|