update

src/main/java/com/zhiqiyun/open/models/RangeDate.java

@@ -23,7 +23,7 @@ public class RangeDate implements Serializable {
             try {
                 RangeDate rangeDate = new RangeDate();
                 Calendar cal = new GregorianCalendar();
-                Date statDate = DateUtils.parseDate(listRangeDate.get(0), "yyyy-MM-dd HH:mm:ss");
+                Date statDate = DateUtils.parseDate(listRangeDate.get(0), "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss");
                 cal.setTime(statDate);
                 cal.set(Calendar.HOUR_OF_DAY, 0);
                 cal.set(Calendar.MINUTE, 0);
@@ -31,7 +31,7 @@ public class RangeDate implements Serializable {
                 cal.set(Calendar.MILLISECOND, 0);
                 rangeDate.setStatDate(cal.getTime());
 
-                Date endDate = DateUtils.parseDate(listRangeDate.get(1), "yyyy-MM-dd HH:mm:ss");
+                Date endDate = DateUtils.parseDate(listRangeDate.get(1), "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss");
                 cal.setTime(endDate);
                 cal.set(Calendar.HOUR_OF_DAY, 23);
                 cal.set(Calendar.MINUTE, 59);

src/main/java/com/zhiqiyun/open/mvc/manager/params/QueryUserParam.java

@@ -16,8 +16,10 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class QueryUserParam extends QueryPageParams {
+    private Long id;
     private String nickName;
-    private String userName;
+    private String mp;
+    private String email;
     private UserState state;
     private Gender gender;
 

src/main/resources/mybatis/mappers/UserBaseInfoMapper.xml

@@ -46,18 +46,25 @@
         <include refid="Base_Column"/>
         from `user_base_info`
         <where>
+            <if test="id != null">
+                AND `id` = #{id}
+            </if>
             <if test="nickName != null and nickName !=''">
                 AND `nick_name` = #{nickName,jdbcType=VARCHAR}
             </if>
-            <if test="userName != null and userName !=''">
+            <if test="mp != null and mp !=''">
+                AND `id` in (select `uid` from `user_login_account` where `login_account` like
+                CONCAT('%',#{mp,jdbcType=VARCHAR},'%'))
+            </if>
+            <if test="email != null and email !=''">
                 AND `id` in (select `uid` from `user_login_account` where `login_account` like
-                CONCAT('%',#{userName,jdbcType=VARCHAR},'%'))
+                CONCAT('%',#{email,jdbcType=VARCHAR},'%'))
             </if>
             <if test="state != null">
-                AND `state` = #{state, typeHandler=com.dliyun.commons.typeHandler.IEnumTypeHandler}
+                AND `state` = #{state, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}
             </if>
             <if test="gender != null">
-                AND `gender` = #{gender, typeHandler=com.dliyun.commons.typeHandler.IEnumTypeHandler}
+                AND `gender` = #{gender, typeHandler=com.zhiqiyun.open.mybatis.typeHandler.IEnumTypeHandler}
             </if>
             <if test="registerTime != null">
                 AND `register_time` between #{registerTime.statDate, jdbcType=TIMESTAMP} and