用户管理用户查询接口新增查询字段userName，phone

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -103,6 +103,9 @@
         <include refid="table"/>
         <where>
             is_delete=0
+            <if test="userName != null">and user_name = #{userName}</if>
+
+            <if test="phone != null">and phone =#{phone}</if>
 
             <if test="startTime != null">
                 and create_time
@@ -121,7 +124,9 @@
         <include refid="table"/>
         <where>
              is_delete=0
+            <if test="userName != null">and user_name = #{userName}</if>
 
+            <if test="phone != null">and phone =#{phone}</if>
             <if test="startTime != null">
                 and create_time
                 between #{startTime}

wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserQueryVo.java

@@ -52,6 +52,18 @@ public class UserQueryVo implements Serializable {
     @ApiModelProperty(value = "页大小", name = "pageSize")
     private Integer pageSize;
 
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(value= "用户名" ,name="userName")
+    private String userName;
+
+    /**
+     * 电话号码
+     */
+    @ApiModelProperty(name = "phone",value = "手机号")
+    private String phone;
+
     private Integer startNum;
 
     private Integer endNum;

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -66,6 +66,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         map.put("pageSize", queryVo.getPageSize());
         map.put("startTime", queryVo.getStartTime());
         map.put("endTime", queryVo.getEndTime());
+        map.put("userName",queryVo.getUserName());
+        map.put("phone",queryVo.getPhone());
 
         //查询用户数据
         List<User> list1 = usersMapper.getList(map);