update

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

@@ -447,6 +447,9 @@
             <if test="userId != null and userId != ''">
                 user_id = #{userId}
             </if>
+            <if test="queryTime != null and queryTime != ''">
+                and `create_time` = #{queryTime}
+            </if>
         </where>
         order by create_time desc
         limit #{startNum},#{endNum}
@@ -460,7 +463,7 @@
             <if test="userId != null and userId != ''">
                 user_id=#{userId}
             </if>
-            <if test="create_time != null and queryTime != ''">
+            <if test="queryTime != null and queryTime != ''">
                 and `create_time` = #{queryTime}
             </if>
         </where>

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

@@ -145,7 +145,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             String byqm = user.getBeInvitedCode();
 
 
-
             //通过被邀请码，比对本人邀请码查询本人id
             String idb = String.valueOf(usersMapper.beInvitedCode1(beInvitedCode));
 
@@ -374,6 +373,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
     /**
      * 用户分页查询
+     *
      * @param queryDto 查询参数
      * @return
      */
@@ -386,7 +386,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         pageHandle(queryDto);
         Map<String, Object> map = new HashMap<>(8);
 
-        map.put("userId", queryDto.getUserId());
+        if (!StringUtils.isBlank(queryDto.getUserId())) {
+            map.put("userId", queryDto.getUserId());
+        }
         if (!StringUtils.isBlank(queryDto.getQueryTime())) {
             Date date = DateUtil.convertStrToDate(queryDto.getQueryTime(), "yyyy-MM-dd");
             map.put("queryTime", date);
@@ -394,7 +396,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
         int total = usersMapper.count(map);
 
-
         map.put("startNum", queryDto.getStartNum());
         map.put("endNum", queryDto.getEndNum());
         List<User> list = usersMapper.getList(map);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java

@@ -2,7 +2,6 @@ package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.AccountInfo;
-import cn.wisenergy.model.app.User;
 import cn.wisenergy.model.dto.AccountInfoQuery;
 import cn.wisenergy.service.app.AccountService;
 import cn.wisenergy.service.app.DayTaskService;