Browse Source

Merge branch 'prod' into test02

# Conflicts:
#	src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
anderx 3 years ago
parent
commit
d62ee77418

+ 3 - 5
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -162,14 +162,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
 		params.put("o", order);
-		List<String> listDep=null;
-		if (order.getDeps()!=null){
-			listDep=departmentService.parseArray(order.getDeps());
-			params.put("deps", listDep);
+		if (StringUtils.isNotBlank(order.getDepartmentId())){
+			params.put("deps", departmentService.getLowerDep(order.getDepartmentId()));
 		}
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
 		result.put("pagination", data);
-		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids,listDep);
+		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order,fids);
 		result.put("count", count);
 		return result;
 	}