Browse Source

查询BUG修改

anderx 3 years ago
parent
commit
d264b0252b

+ 6 - 6
src/main/java/com/goafanti/patent/bo/PatentNewBo.java

@@ -61,8 +61,8 @@ public class PatentNewBo extends PatentNew{
 	private String createTimes;
 	@Excel(name = "跟进人")
 	private String aname;
-	private List<String> inputDep;
-	private List<String> followDep;
+	private String inputDep;
+	private String followDep;
 	private String updateTimes;
 	private String startDates;
 	private String endDates;
@@ -71,19 +71,19 @@ public class PatentNewBo extends PatentNew{
 	private String createEnds;
 	private Integer isFollow;
 
-	public List<String> getInputDep() {
+	public String getInputDep() {
 		return inputDep;
 	}
 
-	public void setInputDep(List<String> inputDep) {
+	public void setInputDep(String inputDep) {
 		this.inputDep = inputDep;
 	}
 
-	public List<String> getFollowDep() {
+	public String getFollowDep() {
 		return followDep;
 	}
 
-	public void setFollowDep(List<String> followDep) {
+	public void setFollowDep(String followDep) {
 		this.followDep = followDep;
 	}
 

+ 4 - 4
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -232,11 +232,11 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		if(p.getAnnualFeeStatus()!=null)params.put("annualFeeStatus", p.getAnnualFeeStatus());
 		if(p.getUserName()!=null)params.put("userName", p.getUserName());
 		if(p.getSalesmanRemind()!=null)params.put("salesmanRemind", p.getSalesmanRemind());
-		if(!p.getInputDep().isEmpty()){
-			params.put("inputDep", p.getInputDep());
+		if(p.getInputDep()!=null){
+			params.put("inputDep", departmentService.parseArray(p.getInputDep()));
 		}
-		if(!p.getFollowDep().isEmpty()){
-			params.put("followDep", p.getFollowDep());
+		if(p.getFollowDep()!=null){
+			params.put("followDep", departmentService.parseArray(p.getInputDep()));
 		}
 
 		if(p.getIsFollow()!=null) {

+ 3 - 3
src/main/java/com/goafanti/user/bo/InputUserFollowList.java

@@ -14,7 +14,7 @@ public class InputUserFollowList {
     private String createEndTime;
     private String guidanceStartTime;
     private String guidanceEndTime;
-    private List<String> deps;
+    private String deps;
     /** 0自己 1下级 2全部*/
     private Integer shiroType;
     private String followName;
@@ -85,11 +85,11 @@ public class InputUserFollowList {
         this.guidanceEndTime = guidanceEndTime;
     }
 
-    public List<String> getDeps() {
+    public String getDeps() {
         return deps;
     }
 
-    public void setDeps(List<String> deps) {
+    public void setDeps(String deps) {
         this.deps = deps;
     }
 

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

@@ -53,8 +53,8 @@ public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  imp
         if (in.getCreateEndTime()!=null) map.put("createEndTime", in.getCreateEndTime()+" 23:59:59");
         if (in.getGuidanceStartTime()!=null) map.put("guidanceStartTime", in.getGuidanceStartTime());
         if (in.getGuidanceEndTime()!=null) map.put("guidanceEndTime", in.getGuidanceEndTime()+" 23:59:59");
-        if (!in.getDeps().isEmpty()){
-            map.put("deps", in.getDeps());
+        if (in.getDeps()!=null){
+            map.put("deps", departmentService.parseArray(in.getDeps()));
         }
         if (in.getShiroType()!=null)map.put("shiroType",in.getShiroType());
         else map.put("shiroType",0);