Commit 863b7623c263c0118710c2bcf12cf79e20c3b276
1 parent
c05232c7
用户增加自由员工
Showing
2 changed files
with
7 additions
and
0 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserPageReqVO.java
| @@ -41,4 +41,10 @@ public class UserPageReqVO extends PageParam { | @@ -41,4 +41,10 @@ public class UserPageReqVO extends PageParam { | ||
| 41 | @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") | 41 | @Schema(description = "业务线:yl-园林;wy-物业;sz-市政", example = "yl") |
| 42 | private String busiLine; | 42 | private String busiLine; |
| 43 | 43 | ||
| 44 | + /** | ||
| 45 | + * 是否是内部员工 是否内部员工 1:是;2否 | ||
| 46 | + */ | ||
| 47 | + @Schema(description = "是否是内部员工 1:是;2否", example = "1") | ||
| 48 | + private Integer isInner; | ||
| 49 | + | ||
| 44 | } | 50 | } |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java
| @@ -33,6 +33,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> { | @@ -33,6 +33,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> { | ||
| 33 | .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) | 33 | .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime()) |
| 34 | .inIfPresent(AdminUserDO::getDeptId, deptIds) | 34 | .inIfPresent(AdminUserDO::getDeptId, deptIds) |
| 35 | .inIfPresent(AdminUserDO::getId, userIds) | 35 | .inIfPresent(AdminUserDO::getId, userIds) |
| 36 | + .eqIfPresent(AdminUserDO::getIsInner, reqVO.getIsInner()) | ||
| 36 | .orderByDesc(AdminUserDO::getId)); | 37 | .orderByDesc(AdminUserDO::getId)); |
| 37 | } | 38 | } |
| 38 | 39 |