|
|
@@ -591,6 +591,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if(specially==4) params.put("distribution",distribution);
|
|
|
// 计算出所有本部门及所属部门的ID
|
|
|
if(specially==1||specially==5) params.put("deps", orderService.selectMyDeps());
|
|
|
+ }else if(specially==8){
|
|
|
+ if (StringUtils.isNotBlank(uid)) params.put("uid", uid);
|
|
|
+ if (StringUtils.isNotBlank(aid)) params.put("aid", aid);
|
|
|
}
|
|
|
params.put("specially",specially);
|
|
|
if (StringUtils.isNotBlank(name)) params.put("name", name);
|
|
|
@@ -604,7 +607,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
if (StringUtils.isNotBlank(contractStart)) params.put("contractStart", contractStart);
|
|
|
if (StringUtils.isNotBlank(contractEnd)) params.put("contractEnd", contractEnd+" 23:59:59");
|
|
|
- if (StringUtils.isNotBlank(uid)) params.put("uid", uid);
|
|
|
params.put("outsource", outsource);
|
|
|
Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
|
|
|
return p;
|