diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java index 64488fe..ef9a399 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java @@ -95,6 +95,9 @@ public class SysTenUserController extends AbstractController { @ApiOperation("保存用户") public R save(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, AddGroup.class); + if(user.getPassword().trim().length() == 0){ + return R.error("密码不能为空"); + } long id = new SnowflakeIdWorker().nextId(); user.setUserId(Long.valueOf(id)); user.setCreateBy(getUser().getNickName()); diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml index d8d2806..0a00b1c 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenPersonDao.xml @@ -615,6 +615,9 @@ and r.room_name like CONCAT('%', '${params.roomName}', '%') + + and r.room_id = #{params.roomId} + and p.name like CONCAT('%', '${params.name}', '%')