修改

zxkf-api/src/main/java/api/controller/call/CallLogController.java

@@ -1,6 +1,5 @@
 package api.controller.call;
 
-import api.entity.database.call.Record;
 import api.service.system.IConfigService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -43,7 +42,8 @@ public class CallLogController extends BaseController {
         qw.eq(!StringHelper.isEmpty(input.getCallee()), CallLog::getCallee, input.getCallee());
         qw.eq(!StringHelper.isEmpty(input.getGroupNo()), CallLog::getGroupNo, input.getGroupNo());
         qw.eq(input.getCallType() != null && input.getCallType() > 0, CallLog::getCallType, input.getCallType());
-        qw.eq(input.getCreateTime() != null , CallLog::getCreateTime, input.getCreateTime());
+        qw.ge(input.getCreateTime() != null , CallLog::getCreateTime, input.getCreateTime());
+        qw.le(input.getEndTime() != null , CallLog::getCreateTime, input.getEndTime());
         qw.eq(input.getIsAnswer() != null && input.getIsAnswer() > 0, CallLog::getIsAnswer, input.getIsAnswer());
         qw.eq(input.getOpType() != null && input.getOpType() > 0, CallLog::getOpType, input.getOpType());
         qw.eq(input.getMyd() != null && input.getMyd() > 0, CallLog::getMyd, input.getMyd());

zxkf-api/src/main/java/api/controller/system/UserController.java

@@ -9,7 +9,6 @@ import api.entity.database.system.Dept;
 import api.entity.database.system.Role;
 import api.entity.database.system.User;
 import api.entity.input.PageInput;
-import api.mapper.system.UserMapper;
 import api.model.AjaxResult;
 import api.service.system.IDeptService;
 import api.service.system.IRoleService;
@@ -49,21 +48,12 @@ public class UserController extends BaseController {
         qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
         qw.like(!StringHelper.isEmpty(input.getUserName()), User::getUserName, input.getUserName());
         qw.like(!StringHelper.isEmpty(input.getNickName()), User::getNickName, input.getNickName());
-        qw.like(!StringHelper.isEmpty(input.getUserType()), User::getUserType, input.getUserType());
+        qw.eq(!StringHelper.isEmpty(input.getUserType()), User::getUserType, input.getUserType());
         qw.like(!StringHelper.isEmpty(input.getEmail()), User::getEmail, input.getEmail());
         qw.like(!StringHelper.isEmpty(input.getPhonenumber()), User::getPhonenumber, input.getPhonenumber());
-        qw.like(!StringHelper.isEmpty(input.getSex()), User::getSex, input.getSex());
-        qw.like(!StringHelper.isEmpty(input.getAvatar()), User::getAvatar, input.getAvatar());
-        qw.like(!StringHelper.isEmpty(input.getPassword()), User::getPassword, input.getPassword());
-        qw.like(!StringHelper.isEmpty(input.getStatus()), User::getStatus, input.getStatus());
+        qw.eq(!StringHelper.isEmpty(input.getSex()), User::getSex, input.getSex());
+        qw.eq(!StringHelper.isEmpty(input.getStatus()), User::getStatus, input.getStatus());
         qw.eq(User::getDelFlag, "0");
-        qw.like(!StringHelper.isEmpty(input.getLoginIp()), User::getLoginIp, input.getLoginIp());
-        qw.eq(input.getLoginDate() != null, User::getLoginDate, input.getLoginDate());
-        qw.like(!StringHelper.isEmpty(input.getCreateBy()), User::getCreateBy, input.getCreateBy());
-        qw.eq(input.getCreateTime() != null, User::getCreateTime, input.getCreateTime());
-        qw.like(!StringHelper.isEmpty(input.getUpdateBy()), User::getUpdateBy, input.getUpdateBy());
-        qw.eq(input.getUpdateTime() != null, User::getUpdateTime, input.getUpdateTime());
-        qw.like(!StringHelper.isEmpty(input.getRemark()), User::getRemark, input.getRemark());
         Page<User> page = GetPage(pageInput);
         if (page != null) {
             //IPage<User> iPage = userService.getListPage(page, qw);