教室信息

controller/src/main/java/com/koobietech/eas/controller/EasEduClassroomController.java

@@ -0,0 +1,65 @@
+package com.koobietech.eas.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+import com.koobietech.eas.service.EasEduClassroomService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Tag(name = "教室信息")
+@RequestMapping("/classroom")
+public class EasEduClassroomController {
+    @Resource
+    EasEduClassroomService easEduClassroomService;
+
+
+    @PostMapping("/query")
+    @Operation(summary = "查询教室" ,  description = "根据参数查询基本信息")
+    public JsonPageResult query(@RequestBody EasEduClassroom classroom,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easEduClassroomService.query(classroom);
+        return JsonPageResult.data(ret);
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "添加教室" ,  description = "用于添加教室信息")
+    public JsonResult add(@RequestBody EasEduClassroom classroom) {
+        Boolean ret = easEduClassroomService.add(classroom);
+        if (ret) {
+            return JsonResult.data(ret);
+        }
+        return JsonResult.fail();
+    }
+
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除教室" ,  description = "删除教室信息根据ID")
+    public JsonResult delete(@RequestParam Integer id) {
+        Boolean ret = easEduClassroomService.delete(id);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+    @PutMapping("/update")
+    @Operation(summary = "更新教室" ,  description = "更新教室信息根据ID")
+    public JsonResult update(@RequestBody EasEduClassroom classroom) {
+        Boolean ret = easEduClassroomService.update(classroom);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+}

controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysDepartmentController.java

@@ -5,7 +5,7 @@ import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
-import com.koobietech.eas.service.EasDepartmentService;
+import com.koobietech.eas.service.EasSysDepartmentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -16,10 +16,10 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "部门模块")
 @RequestMapping("/department")
-public class EasDepartmentController {
+public class EasSysDepartmentController {
 
     @Resource
-    EasDepartmentService easDepartmentService;
+    EasSysDepartmentService easSysDepartmentService;
 
 
     @PostMapping("/query")
@@ -27,14 +27,14 @@ public class EasDepartmentController {
     public JsonPageResult query(@RequestBody EasSysDepartment department,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easDepartmentService.query(department);
+        PageData ret = easSysDepartmentService.query(department);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
     @Operation(summary = "添加部门" ,  description = "添加部门信息")
     public JsonResult add(@RequestBody EasSysDepartment department) {
-        Boolean ret = easDepartmentService.add(department);
+        Boolean ret = easSysDepartmentService.add(department);
         if (ret) {
             return JsonResult.data(ret);
         }
@@ -42,10 +42,10 @@ public class EasDepartmentController {
     }
 
 
-    @DeleteMapping("/delete/{id}")
+    @DeleteMapping("/delete")
     @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
-    public JsonResult delete(@PathVariable(name="id") Long id) {
-        Boolean ret = easDepartmentService.delete(id);
+    public JsonResult delete(@RequestParam Long id) {
+        Boolean ret = easSysDepartmentService.delete(id);
         if (ret) {
             return JsonResult.ok();
         }
@@ -56,7 +56,7 @@ public class EasDepartmentController {
     @PutMapping("/update")
     @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
     public JsonResult update(@RequestBody EasSysDepartment department) {
-        Boolean ret = easDepartmentService.update(department);
+        Boolean ret = easSysDepartmentService.update(department);
         if (ret) {
             return JsonResult.ok();
         }

controller/src/main/java/com/koobietech/eas/controller/EasPermissionController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysPermissionController.java

@@ -5,7 +5,7 @@ import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
-import com.koobietech.eas.service.EasPermissionService;
+import com.koobietech.eas.service.EasSysPermissionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -16,24 +16,24 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "权限模块")
 @RequestMapping("/permission")
-public class EasPermissionController {
+public class EasSysPermissionController {
 
     @Resource
-    EasPermissionService easPermissionService;
+    EasSysPermissionService easSysPermissionService;
 
     @PostMapping("/query")
     @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
     public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easPermissionService.query(permission);
+        PageData ret = easSysPermissionService.query(permission);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
     @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
     public JsonResult add(@RequestBody EasSysPermission permission){
-        Boolean ret = easPermissionService.add(permission);
+        Boolean ret = easSysPermissionService.add(permission);
         if(ret){
             return JsonResult.ok();
         }
@@ -43,7 +43,7 @@ public class EasPermissionController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
     public JsonResult delete(@RequestParam Integer id){
-        Boolean ret = easPermissionService.delete(id);
+        Boolean ret = easSysPermissionService.delete(id);
         if(ret){
             return JsonResult.ok();
         }
@@ -53,7 +53,7 @@ public class EasPermissionController {
     @PutMapping("/update")
     @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
     public JsonResult update(@RequestBody EasSysPermission permission){
-        Boolean ret = easPermissionService.update(permission);
+        Boolean ret = easSysPermissionService.update(permission);
         if(ret){
             return JsonResult.ok();
         }

controller/src/main/java/com/koobietech/eas/controller/EasUserInfoController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysUserInfoController.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
-import com.koobietech.eas.service.EasUserInfoService;
+import com.koobietech.eas.service.EasSysUserInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -14,15 +14,15 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "用户信息模块")
 @RequestMapping("/userinfo")
-public class EasUserInfoController {
+public class EasSysUserInfoController {
 
     @Resource
-    EasUserInfoService easUserInfoService;
+    EasSysUserInfoService easSysUserInfoService;
 
     @PostMapping("/add")
     @Operation(summary = "添加用户信息", description = "录入基本用户信息")
     public JsonResult add(@RequestBody EasSysUserinfo userinfo) {
-        Boolean ret = easUserInfoService.add(userinfo);
+        Boolean ret = easSysUserInfoService.add(userinfo);
         if (ret) {
             return JsonResult.ok();
         }
@@ -32,7 +32,7 @@ public class EasUserInfoController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除用户信息",description = "删除用户信息表数据根据ID")
     public JsonResult delete(@RequestParam Long id) {
-        Boolean ret = easUserInfoService.delete(id);
+        Boolean ret = easSysUserInfoService.delete(id);
         if (ret) {
             return JsonResult.ok();
         }
@@ -42,7 +42,7 @@ public class EasUserInfoController {
     @PutMapping("/update")
     @Operation(summary = "更新用户信息",description = "更新用户信息表信息")
     public JsonResult update(@RequestBody EasSysUserinfo userinfo) {
-        Boolean ret = easUserInfoService.update(userinfo);
+        Boolean ret = easSysUserInfoService.update(userinfo);
         if (ret) {
             return JsonResult.ok();
         }
@@ -54,7 +54,7 @@ public class EasUserInfoController {
     public JsonResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easUserInfoService.query(userinfo);
+        PageData ret = easSysUserInfoService.query(userinfo);
         return JsonResult.data(ret);
     }
 }

controller/src/main/resources/application-local.yaml

@@ -1,10 +1,10 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:13306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: root
-    password: 0JZBdtlYoiOepddh
+    password: 1234
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     host: localhost

service/src/main/java/com/koobietech/eas/service/EasEduClassroomService.java

@@ -0,0 +1,14 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+
+public interface EasEduClassroomService {
+    PageData query(EasEduClassroom classroom);
+
+    Boolean add(EasEduClassroom classroom);
+
+    Boolean delete(Integer id);
+
+    Boolean update(EasEduClassroom classroom);
+}

service/src/main/java/com/koobietech/eas/service/EasDepartmentService.java → service/src/main/java/com/koobietech/eas/service/EasSysDepartmentService.java

@@ -4,7 +4,7 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 
 
-public interface EasDepartmentService {
+public interface EasSysDepartmentService {
 
     Boolean update(EasSysDepartment department);
     Boolean add(EasSysDepartment department);

service/src/main/java/com/koobietech/eas/service/EasPermissionService.java → service/src/main/java/com/koobietech/eas/service/EasSysPermissionService.java

@@ -3,7 +3,7 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 
-public interface EasPermissionService {
+public interface EasSysPermissionService {
 
     Boolean update(EasSysPermission permisson);
     Boolean add(EasSysPermission permisson);

service/src/main/java/com/koobietech/eas/service/EasUserInfoService.java → service/src/main/java/com/koobietech/eas/service/EasSysUserInfoService.java

@@ -3,13 +3,10 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 
-public interface EasUserInfoService {
+public interface EasSysUserInfoService {
 
     Boolean add(EasSysUserinfo userinfo);
-
     Boolean delete(Long id);
-
     Boolean update(EasSysUserinfo userinfo);
-
     PageData query(EasSysUserinfo userinfo);
 }

service/src/main/java/com/koobietech/eas/service/impl/EasEduClassroomServiceImpl.java

@@ -0,0 +1,91 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+import com.koobietech.eas.mbg.model.EasEduClassroomExample;
+import com.koobietech.eas.service.EasEduClassroomService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasEduClassroomServiceImpl implements EasEduClassroomService {
+    @Resource
+    EasEduClassroomMapper easEduClassroomMapper;
+
+    @Override
+    public Boolean update(EasEduClassroom classroom) {
+        classroom.setModifyTime(new Date());
+        return easEduClassroomMapper.updateByPrimaryKey(classroom) == 1;
+    }
+
+    @Override
+    public Boolean add(EasEduClassroom classroom) {
+        classroom.setCreateTime(new Date());
+        classroom.setModifyTime(new Date());
+        return easEduClassroomMapper.insert(classroom) == 1;
+    }
+
+    @Override
+    public Boolean delete(Integer id) {
+        return easEduClassroomMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public PageData query(EasEduClassroom classroom) {
+
+        EasEduClassroomExample easEduClassroomExample = new EasEduClassroomExample();
+        EasEduClassroomExample.Criteria criteria = easEduClassroomExample.createCriteria();
+        if (Objects.nonNull(classroom)) {
+
+            if (Objects.nonNull(classroom.getId())) {
+                criteria.andIdEqualTo(classroom.getId());
+            }
+
+            if (StringUtils.hasText(classroom.getName())) {
+                criteria.andAddressLike("%" + classroom.getName() + "%");
+            }
+
+            if (StringUtils.hasText(classroom.getAddress())) {
+                criteria.andAddressLike("%" + classroom.getAddress() + "%");
+            }
+
+            if (Objects.nonNull(classroom.getManagerId())) {
+                criteria.andManagerLike("%" + classroom.getManagerId() + "%");
+            }
+
+            if (StringUtils.hasText(classroom.getManager())) {
+                criteria.andManagerLike("%" + classroom.getManager() + "%");
+            }
+
+            if (Objects.nonNull(classroom.getFloor())) {
+                criteria.andFloorEqualTo(classroom.getFloor() );
+            }
+            if (Objects.nonNull(classroom.getCapacity())) {
+                criteria.andCapacityEqualTo(classroom.getCapacity());
+            }
+
+            if (StringUtils.hasText(classroom.getComment())) {
+                criteria.andCommentLike("%" + classroom.getComment() + "%");
+            }
+
+            if (Objects.nonNull(classroom.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(classroom.getCreateTime());
+            }
+
+
+        }
+        List<EasEduClassroom> classrooms =
+                easEduClassroomMapper.selectByExample(easEduClassroomExample);
+        long l = easEduClassroomMapper.countByExample(easEduClassroomExample);
+        PageData ret = new PageData();
+        ret.setData(classrooms);
+        ret.setTotal(l);
+        return ret;
+    }
+}

service/src/main/java/com/koobietech/eas/service/impl/EasDepartmentServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysDepartmentServiceImpl.java

@@ -4,7 +4,7 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasSysDepartmentMapper;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
-import com.koobietech.eas.service.EasDepartmentService;
+import com.koobietech.eas.service.EasSysDepartmentService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -15,7 +15,7 @@ import java.util.Objects;
 
 
 @Service
-public class EasDepartmentServiceImpl implements EasDepartmentService {
+public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
 
     @Resource
     EasSysDepartmentMapper easSysDepartmentMapper;
@@ -44,30 +44,37 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
         EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
         EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
         if (Objects.nonNull(department)) {
+
             if (Objects.nonNull(department.getId())) {
                 criteria.andIdEqualTo(department.getId());
             }
+
             if (StringUtils.hasText(department.getAddress())) {
                 criteria.andAddressLike("%" + department.getAddress() + "%");
             }
+
             if (StringUtils.hasText(department.getDepname())) {
                 criteria.andDepnameLike("%" + department.getDepname() + "%");
             }
+
             if (StringUtils.hasText(department.getEmail())) {
                 criteria.andEmailLike("%" + department.getEmail() + "%");
             }
+
             if (StringUtils.hasText(department.getManager())) {
                 criteria.andManagerLike("%" + department.getManager() + "%");
             }
+
             if (StringUtils.hasText(department.getPhone())) {
                 criteria.andPhoneLike("%" + department.getPhone() + "%");
             }
+
             if (Objects.nonNull(department.getCreateTime())) {
                 criteria.andCreateTimeGreaterThan(department.getCreateTime());
             }
         }
         List<EasSysDepartment> departments =
-                 easSysDepartmentMapper.selectByExample(departmentExample);
+                easSysDepartmentMapper.selectByExample(departmentExample);
         long l = easSysDepartmentMapper.countByExample(departmentExample);
         PageData ret = new PageData();
         ret.setData(departments);

service/src/main/java/com/koobietech/eas/service/impl/EasPermissionServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysSysPermissionServiceImpl.java

@@ -4,7 +4,7 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
-import com.koobietech.eas.service.EasPermissionService;
+import com.koobietech.eas.service.EasSysPermissionService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasPermissionServiceImpl implements EasPermissionService {
+public class EasSysSysPermissionServiceImpl implements EasSysPermissionService {
 
     @Resource
     EasSysPermissionMapper easSysPermissionMapper;
@@ -42,18 +42,23 @@ public class EasPermissionServiceImpl implements EasPermissionService {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
         EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
         if ( Objects.nonNull(permission) ) {
+
             if (Objects.nonNull(permission.getId())) {
                 criteria.andIdEqualTo(permission.getId());
             }
+
             if (Objects.nonNull(permission.getIsActive())) {
                 criteria.andIsActiveEqualTo(permission.getIsActive());
             }
+
             if (StringUtils.hasText(permission.getDisabled())) {
                 criteria.andDisabledEqualTo(permission.getDisabled());
             }
+
             if (StringUtils.hasText(permission.getName())) {
                 criteria.andNameLike("%" + permission.getName() + "%");
             }
+
             if (Objects.nonNull(permission.getCreateTime())) {
                 criteria.andCreateTimeGreaterThan(permission.getCreateTime());
             }

service/src/main/java/com/koobietech/eas/service/impl/EasUserInfoServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysSysUserInfoServiceImpl.java

@@ -4,22 +4,23 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasSysUserinfoMapper;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
-import com.koobietech.eas.service.EasUserInfoService;
+import com.koobietech.eas.service.EasSysUserInfoService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasUserInfoServiceImpl implements EasUserInfoService {
+public class EasSysSysUserInfoServiceImpl implements EasSysUserInfoService {
 
     @Resource
     EasSysUserinfoMapper easSysUserinfoMapper;
 
     final String userInfoName = "admin";
+
     @Override
     public Boolean add(EasSysUserinfo userinfo) {
         //给用户信息设置默认密码
@@ -29,7 +30,7 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
         return easSysUserinfoMapper.insert(userinfo) == 1;
     }
 
-    public EasSysUserinfo getUserById(Long id){
+    public EasSysUserinfo getUserById(Long id) {
         return easSysUserinfoMapper.selectByPrimaryKey(id);
     }
 
@@ -37,7 +38,7 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
     public Boolean delete(Long id) {
         //判断是否为admin用户信息，admin用户信息禁止删除
         EasSysUserinfo userinfo = getUserById(id);
-        if ( userinfo.getUsername().equals(userInfoName) ) {
+        if (userinfo.getUsername().equals(userInfoName)) {
             return false;
         }
         return easSysUserinfoMapper.deleteByPrimaryKey(id) == 1;
@@ -47,8 +48,8 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
     public Boolean update(EasSysUserinfo userinfo) {
         //判断是否为admin用户信息，admin用户信息中的Username禁止修改
         EasSysUserinfo user = getUserById(userinfo.getId());
-        if ( user.getUsername().equals(userInfoName) ) {
-            userinfo.setUsername( user.getUsername() );
+        if (user.getUsername().equals(userInfoName)) {
+            userinfo.setUsername(user.getUsername());
         }
         userinfo.setModifyTime(new Date());
         return easSysUserinfoMapper.updateByPrimaryKey(userinfo) == 1;
@@ -59,37 +60,38 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
 
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
         EasSysUserinfoExample.Criteria criteria = easSysUserinfoExample.createCriteria();
-        if(Objects.nonNull(userinfo)) {
-            if(Objects.nonNull(userinfo.getId())){
+        if (Objects.nonNull(userinfo)) {
+
+            if (Objects.nonNull(userinfo.getId())) {
                 criteria.andIdEqualTo(userinfo.getId());
             }
 
-            if(Objects.nonNull(userinfo.getPhone())){
-                criteria.andPhoneEqualTo(userinfo.getPhone());
+            if (StringUtils.hasText(userinfo.getPhone())) {
+                criteria.andPhoneLike("%" + userinfo.getPhone() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getPasswd())){
-                criteria.andPasswdEqualTo(userinfo.getPasswd());
+            if (StringUtils.hasText(userinfo.getPasswd())) {
+                criteria.andPasswdLike("%" + userinfo.getPasswd() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getEmail())){
-                criteria.andEmailEqualTo(userinfo.getEmail());
+            if (StringUtils.hasText(userinfo.getEmail())) {
+                criteria.andEmailLike("%" + userinfo.getEmail() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getRelname())){
-                criteria.andRelnameEqualTo(userinfo.getRelname());
+            if (StringUtils.hasText(userinfo.getRelname())) {
+                criteria.andRelnameLike("%" + userinfo.getRelname() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getUsername())){
-                criteria.andUsernameEqualTo(userinfo.getUsername());
+            if (StringUtils.hasText(userinfo.getUsername())) {
+                criteria.andUsernameLike("%" + userinfo.getUsername() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getAddress())){
-                criteria.andAddressEqualTo(userinfo.getAddress());
+            if (StringUtils.hasText(userinfo.getAddress())) {
+                criteria.andAddressLike("%" + userinfo.getAddress() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getCreateTime())){
-                criteria.andCreateTimeEqualTo(userinfo.getCreateTime());
+            if (Objects.nonNull(userinfo.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(userinfo.getCreateTime());
             }
 
         }