Commit 32d32e5a by 王军业

[更新]

1 parent f1804a7c
......@@ -172,12 +172,13 @@ public class ContractServiceImpl implements ContractService {
public Object selectByCondition(SelectVo selectVo) {
// TODO Auto-generated method stub
try {
ResultVo resultVo=new ResultVo();
logger.info("========================筛选合同列表===========================");
List<Map> list_data = null;
if (StringUtils.isNotBlank(selectVo.getSalesperson_name__like())) {
// 调用auth服务的接口获取用户列表信息
String url = financeConfig.getAuthurl();
String result = HttpNetClient.doGet(url, null);
String result = HttpNetClient.doGet(url+"?username="+selectVo.getSalesperson_name__like(), null);
Map map = JavaBean2Json.Json2JavaBean(result, Map.class);
list_data = (List<Map>) map.get("list_data");
if(list_data != null && list_data.size() > 0) {
......@@ -186,6 +187,12 @@ public class ContractServiceImpl implements ContractService {
salesperson_unids.add((String) _map.get("user_unid"));
}
selectVo.setSalesperson_unids(salesperson_unids);
}else {
resultVo.setList_data(new ArrayList<>());
resultVo.setList_size(selectVo.getLimit()== null ? 0 : selectVo.getLimit());
resultVo.setOffset(selectVo.getOffset()== null ? 0 : selectVo.getOffset());
resultVo.setTotal_number(0);
return resultVo;
}
}
......@@ -200,7 +207,6 @@ public class ContractServiceImpl implements ContractService {
}
}
}
ResultVo resultVo=new ResultVo();
resultVo.setList_data(list);
resultVo.setList_size(selectVo.getLimit());
resultVo.setOffset(selectVo.getOffset());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!