lyhzzz 2 years ago
parent
commit
0049cefd72

+ 2 - 1
src/main/java/com/cdf/request/LogRequest.java

@@ -2,6 +2,7 @@ package com.cdf.request;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -12,7 +13,7 @@ public class LogRequest extends BaseRequest{
     private String startTime;
     private String endTime;
 
-    private List<Integer> deptIds;
+    private List<Integer> deptIds = new ArrayList<>();
     private String token;
 
 }

+ 2 - 1
src/main/java/com/cdf/request/UserRequest.java

@@ -2,6 +2,7 @@ package com.cdf.request;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -12,5 +13,5 @@ public class UserRequest extends BaseRequest{
     private String nickName;
     private Integer deptId;
     private String token;
-    private List<Integer> deptIds;
+    private List<Integer> deptIds = new ArrayList<>();
 }

+ 1 - 1
src/main/resources/mapper/LogMapper.xml

@@ -23,7 +23,7 @@
         <if test="param.endTime != null and param.endTime != ''">
             and l.create_time  &lt;=   #{param.endTime}
         </if>
-        <if test="param.deptIds != null and param.deptIds.size >0 ''">
+        <if test="param.deptIds != null and param.deptIds.size >0 ">
             and u.dept_id in
             <foreach collection="param.deptIds" item="deptId" open="(" separator="," close=")">
                 #{deptId}

+ 1 - 1
src/main/resources/mapper/UserMapper.xml

@@ -22,7 +22,7 @@
         <if test="param.endTime != null and param.endTime != ''">
             and u.create_time  &lt;=   #{param.endTime}
         </if>
-        <if test="param.deptIds != null and param.deptIds.size >0 ''">
+        <if test="param.deptIds != null and param.deptIds.size >0 ">
             and u.dept_id in
             <foreach collection="param.deptIds" item="deptId" open="(" separator="," close=")">
                 #{deptId}