anderx лет назад: 3
Родитель
Сommit
3c1056abb0

+ 9 - 9
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -98,7 +98,7 @@ public class OrderListBo {
 	/** 收款公司名称 **/
 	private String companyName;
 	/** 部门编号*/
-	private List<String> deps;
+	private String deps;
 	/** 外包*/
 	private Integer outsource;
 	/** 外包名称*/
@@ -122,6 +122,14 @@ public class OrderListBo {
 	@Excel(name="销售说明")
 	private String other;
 
+	public String getDeps() {
+		return deps;
+	}
+
+	public void setDeps(String deps) {
+		this.deps = deps;
+	}
+
 	public Integer getSalesType() {
 		return salesType;
 	}
@@ -352,14 +360,6 @@ public class OrderListBo {
 		this.contractNo = contractNo;
 	}
 
-	public List<String> getDeps() {
-		return deps;
-	}
-
-	public void setDeps(List<String> deps) {
-		this.deps = deps;
-	}
-
 	public Integer getOutsource() {
 		return outsource;
 	}

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

@@ -162,8 +162,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包
 		params.put("o", order);
-		if (order.getDeps().isEmpty()){
-			params.put("deps", order.getDeps());
+		if (order.getDeps()!=null){
+			params.put("deps", departmentService.parseArray(order.getDeps()));
 		}
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
 		result.put("pagination", data);