From db7ffe29daf8e18a0560ae751bf3c0bfbfa8b43b Mon Sep 17 00:00:00 2001
From: gaoben <ben.gao@shapelight.net>
Date: Tue, 6 Apr 2021 17:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=AF=E5=AF=86=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=9C=AA=E7=A9=BA=E6=A0=BC=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BE=93=E5=85=A5=E6=88=BF=E9=97=B4=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/systen/controller/SysTenUserController.java        | 3 +++
 .../src/main/resources/mapper/ten/TenPersonDao.xml             | 3 +++
 2 files changed, 6 insertions(+)

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 @@
         <if test="params.roomName != null and params.roomName!=''">
             and r.room_name like CONCAT('%', '${params.roomName}', '%')
         </if>
+        <if test="params.roomId != null and params.roomId!=''">
+            and r.room_id = #{params.roomId}
+        </if>
         <if test="params.name != null and params.name!=''">
             and p.name like CONCAT('%', '${params.name}', '%')
         </if>