Commit 442cba987d7976839ad2c59e6cd474fdba747fd0
Merge remote-tracking branch 'origin/develop' into develop
Showing
3 changed files
with
11 additions
and
0 deletions
pom.xml
| @@ -372,6 +372,11 @@ | @@ -372,6 +372,11 @@ | ||
| 372 | <version>${lombok.version}</version> | 372 | <version>${lombok.version}</version> |
| 373 | <scope>provided</scope> | 373 | <scope>provided</scope> |
| 374 | </dependency> | 374 | </dependency> |
| 375 | + <dependency> | ||
| 376 | + <groupId>com.baomidou</groupId> | ||
| 377 | + <artifactId>mybatis-plus-annotation</artifactId> | ||
| 378 | + <version>3.1.2</version> | ||
| 379 | + </dependency> | ||
| 375 | </dependencies> | 380 | </dependencies> |
| 376 | 381 | ||
| 377 | <build> | 382 | <build> |
src/main/resources/mybatis/system/UserMapper.xml
| @@ -49,6 +49,9 @@ | @@ -49,6 +49,9 @@ | ||
| 49 | <if test="loginName != null and loginName != ''"> | 49 | <if test="loginName != null and loginName != ''"> |
| 50 | AND u.loginName like concat('%', #{loginName}, '%') | 50 | AND u.loginName like concat('%', #{loginName}, '%') |
| 51 | </if> | 51 | </if> |
| 52 | + <if test="userName != null and userName != ''"> | ||
| 53 | + AND u.userName like concat('%', #{userName}, '%') | ||
| 54 | + </if> | ||
| 52 | <if test="enable != null"> | 55 | <if test="enable != null"> |
| 53 | AND u.enable = #{enable} | 56 | AND u.enable = #{enable} |
| 54 | </if> | 57 | </if> |
src/main/resources/templates/system/user/user.html
| @@ -39,6 +39,9 @@ | @@ -39,6 +39,9 @@ | ||
| 39 | 登录名称：<input type="text" name="loginName"/> | 39 | 登录名称：<input type="text" name="loginName"/> |
| 40 | </li> | 40 | </li> |
| 41 | <li> | 41 | <li> |
| 42 | + 用户名称：<input type="text" name="userName"/> | ||
| 43 | + </li> | ||
| 44 | + <li> | ||
| 42 | 手机号码：<input type="text" name="phoneNumber"/> | 45 | 手机号码：<input type="text" name="phoneNumber"/> |
| 43 | </li> | 46 | </li> |
| 44 | <li> | 47 | <li> |