Browse Source

财务导出BUG修复

anderx 3 years ago
parent
commit
bd2e4ad9e4

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

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