diff --git a/pom.xml b/pom.xml index 0f58bbb..97596a1 100644 --- a/pom.xml +++ b/pom.xml @@ -372,6 +372,11 @@ <version>${lombok.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>mybatis-plus-annotation</artifactId> + <version>3.1.2</version> + </dependency> </dependencies> <build> diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml index 744bcd8..e96a88e 100644 --- a/src/main/resources/mybatis/system/UserMapper.xml +++ b/src/main/resources/mybatis/system/UserMapper.xml @@ -49,6 +49,9 @@ <if test="loginName != null and loginName != ''"> AND u.loginName like concat('%', #{loginName}, '%') </if> + <if test="userName != null and userName != ''"> + AND u.userName like concat('%', #{userName}, '%') + </if> <if test="enable != null"> AND u.enable = #{enable} </if> diff --git a/src/main/resources/templates/system/user/user.html b/src/main/resources/templates/system/user/user.html index b749f49..adf0a07 100644 --- a/src/main/resources/templates/system/user/user.html +++ b/src/main/resources/templates/system/user/user.html @@ -39,6 +39,9 @@ 登录名称:<input type="text" name="loginName"/> </li> <li> + 用户名称:<input type="text" name="userName"/> + </li> + <li> 手机号码:<input type="text" name="phoneNumber"/> </li> <li>