Browse Source

查询BUG修改

anderx 3 years ago
parent
commit
5674a8e7c0

+ 3 - 3
src/main/java/com/goafanti/order/bo/InputMemberList.java

@@ -5,7 +5,7 @@ import java.util.List;
 public class InputMemberList {
     private String orderNo;
     private String userName;
-    private List<String> deps;
+    private String deps;
     private String contractNo;
     private String salesmanId;
     private String projectName;
@@ -46,11 +46,11 @@ public class InputMemberList {
         this.userName = userName;
     }
 
-    public List<String> getDeps() {
+    public String getDeps() {
         return deps;
     }
 
-    public void setDeps(List<String> deps) {
+    public void setDeps(String deps) {
         this.deps = deps;
     }
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -511,7 +511,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
 		if (processState==1){
 			List<String > myDep;
-			if (!deps.isEmpty()) {
+			if (deps==null) {
 				myDep=departmentService.selectSubDeps(deps);
 				if (myDep.isEmpty()){
 					return new Pagination(1,10,0);

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 
 import javax.mail.MessagingException;
 
+import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.bo.*;
@@ -1085,7 +1086,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(in.getOrderNo()!=null) map.put("orderNo", in.getOrderNo());
 		if(in.getUserName()!=null) map.put("userName", in.getUserName());
 		if(in.getDeps()!=null&&!in.getDeps().isEmpty()){
-			map.put("deps", in.getDeps());
+			List<String> ls=JSON.parseArray(in.getDeps(),String.class);
+			map.put("deps", ls);
 		}
 		if(in.getContractNo()!=null) map.put("contractNo", in.getContractNo());
 		if(in.getSalesmanId()!=null) map.put("salesmanId", in.getSalesmanId());