Browse Source

查询BUG修改

anderx 3 years ago
parent
commit
f4e5d4bccd

+ 11 - 8
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -6,7 +6,7 @@ public class InputPaymentList {
 	private String contractNo;
 	private String orderNo;
 	private String userName;
-	private List<String> deps;
+	private String deps;
 	private String aname;
 	private String financeName;
 	private String cname;
@@ -15,6 +15,16 @@ public class InputPaymentList {
 	private Integer chooseType;
 	private Integer pageSize;
 	private Integer pageNo;
+
+
+	public String getDeps() {
+		return deps;
+	}
+
+	public void setDeps(String deps) {
+		this.deps = deps;
+	}
+
 	public String getContractNo() {
 		return contractNo;
 	}
@@ -78,13 +88,6 @@ public class InputPaymentList {
 		this.userName = userName;
 	}
 
-	public List<String> getDeps() {
-		return deps;
-	}
-
-	public void setDeps(List<String> deps) {
-		this.deps = deps;
-	}
 
 	public String getPname() {
 		return pname;

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -648,8 +648,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
 		if (i.getOrderNo()!=null)map.put("orderNo", i.getOrderNo());
 		if (i.getUserName()!=null)map.put("userName", i.getUserName());
-		if (!i.getDeps().isEmpty()){
-			map.put("deps", i.getDeps());
+		if (i.getDeps()!=null){
+			map.put("deps", departmentService.parseArray(i.getDeps()));
 		}
 		if (i.getAname()!=null)map.put("aname", i.getAname());
 		if (i.getFinanceName()!=null)map.put("financeName", i.getFinanceName());