From 710e03f3f7703a3bc34e36da2cc3a67f2ac9696e Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 11 Jun 2023 20:49:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90user=E3=80=91=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/SysUserController.java | 12 ---- .../{ => bak}/SysUserDataScopeController.java | 2 +- .../{ => bak}/SysUserGroupController.java | 2 +- .../SysUserGroupDetailController.java | 2 +- .../{ => bak}/SysUserOrgController.java | 2 +- .../{ => bak}/SysUserRoleController.java | 2 +- .../sys/modular/user/entity/SysUser.java | 8 +++ .../user/service/impl/SysUserServiceImpl.java | 61 ++++++------------- 8 files changed, 31 insertions(+), 60 deletions(-) rename kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/{ => bak}/SysUserDataScopeController.java (98%) rename kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/{ => bak}/SysUserGroupController.java (98%) rename kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/{ => bak}/SysUserGroupDetailController.java (98%) rename kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/{ => bak}/SysUserOrgController.java (98%) rename kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/{ => bak}/SysUserRoleController.java (98%) diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java index f73aa5fd7..fa7e35902 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * 系统用户控制器 @@ -76,17 +75,6 @@ public class SysUserController { return new SuccessResponseData<>(sysUserService.detail(sysUserRequest)); } - /** - * 获取列表 - * - * @author fengshuonan - * @date 2023/06/10 21:26 - */ - @GetResource(name = "获取列表", path = "/sysUser/list") - public ResponseData> list(SysUserRequest sysUserRequest) { - return new SuccessResponseData<>(sysUserService.findList(sysUserRequest)); - } - /** * 获取列表（带分页） * diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserDataScopeController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserDataScopeController.java similarity index 98% rename from kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserDataScopeController.java rename to kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserDataScopeController.java index 95d3bccda..ca5276f88 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserDataScopeController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserDataScopeController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.user.controller; +package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupController.java similarity index 98% rename from kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupController.java rename to kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupController.java index 494310088..981376581 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.user.controller; +package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupDetailController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupDetailController.java similarity index 98% rename from kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupDetailController.java rename to kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupDetailController.java index 9ed8789d5..145deccf2 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserGroupDetailController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserGroupDetailController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.user.controller; +package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserOrgController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserOrgController.java similarity index 98% rename from kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserOrgController.java rename to kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserOrgController.java index 1d5056bf7..9120d74e6 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserOrgController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserOrgController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.user.controller; +package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserRoleController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserRoleController.java similarity index 98% rename from kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserRoleController.java rename to kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserRoleController.java index 65e0c9183..44d366813 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/SysUserRoleController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/controller/bak/SysUserRoleController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.user.controller; +package cn.stylefeng.roses.kernel.sys.modular.user.controller.bak; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java index ec38a191f..4d49de851 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.Date; /** @@ -134,6 +135,13 @@ public class SysUser extends BaseExpandFieldEntity { @ChineseDescription("最后登陆时间") private Date lastLoginTime; + /** + * 用户的排序 + */ + @TableField("user_sort") + @ChineseDescription("用户的排序") + private BigDecimal userSort; + /** * 对接外部主数据的用户id */ diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index 48ed0b878..da2bdb538 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser; @@ -27,7 +28,7 @@ import java.util.List; @Service public class SysUserServiceImpl extends ServiceImpl implements SysUserService { - @Override + @Override public void add(SysUserRequest sysUserRequest) { SysUser sysUser = new SysUser(); BeanUtil.copyProperties(sysUserRequest, sysUser); @@ -55,6 +56,10 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public PageResult findPage(SysUserRequest sysUserRequest) { LambdaQueryWrapper wrapper = createWrapper(sysUserRequest); + + // 只查询需要的字段 + wrapper.select(SysUser::getUserId, SysUser::getRealName, SysUser::getAccount, SysUser::getSex, SysUser::getStatusFlag, BaseEntity::getCreateTime); + Page sysRolePage = this.page(PageFactory.defaultPage(), wrapper); return PageResultFactory.createPageResult(sysRolePage); } @@ -88,49 +93,19 @@ public class SysUserServiceImpl extends ServiceImpl impl private LambdaQueryWrapper createWrapper(SysUserRequest sysUserRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Long userId = sysUserRequest.getUserId(); - String realName = sysUserRequest.getRealName(); - String nickName = sysUserRequest.getNickName(); - String account = sysUserRequest.getAccount(); - String password = sysUserRequest.getPassword(); - Long avatar = sysUserRequest.getAvatar(); - String birthday = sysUserRequest.getBirthday(); - String sex = sysUserRequest.getSex(); - String email = sysUserRequest.getEmail(); - String phone = sysUserRequest.getPhone(); - String tel = sysUserRequest.getTel(); - String superAdminFlag = sysUserRequest.getSuperAdminFlag(); - Integer statusFlag = sysUserRequest.getStatusFlag(); - Integer loginCount = sysUserRequest.getLoginCount(); - String lastLoginIp = sysUserRequest.getLastLoginIp(); - String lastLoginTime = sysUserRequest.getLastLoginTime(); - String masterUserId = sysUserRequest.getMasterUserId(); - String expandField = sysUserRequest.getExpandField(); - Long versionFlag = sysUserRequest.getVersionFlag(); - String delFlag = sysUserRequest.getDelFlag(); - Long tenantId = sysUserRequest.getTenantId(); + // 根据输入内容进行查询 + String searchText = sysUserRequest.getSearchText(); + if (ObjectUtil.isNotEmpty(searchText)) { + queryWrapper.like(SysUser::getRealName, searchText); + queryWrapper.or().like(SysUser::getAccount, searchText); + } - queryWrapper.eq(ObjectUtil.isNotNull(userId), SysUser::getUserId, userId); - queryWrapper.like(ObjectUtil.isNotEmpty(realName), SysUser::getRealName, realName); - queryWrapper.like(ObjectUtil.isNotEmpty(nickName), SysUser::getNickName, nickName); - queryWrapper.like(ObjectUtil.isNotEmpty(account), SysUser::getAccount, account); - queryWrapper.like(ObjectUtil.isNotEmpty(password), SysUser::getPassword, password); - queryWrapper.eq(ObjectUtil.isNotNull(avatar), SysUser::getAvatar, avatar); - queryWrapper.eq(ObjectUtil.isNotNull(birthday), SysUser::getBirthday, birthday); - queryWrapper.like(ObjectUtil.isNotEmpty(sex), SysUser::getSex, sex); - queryWrapper.like(ObjectUtil.isNotEmpty(email), SysUser::getEmail, email); - queryWrapper.like(ObjectUtil.isNotEmpty(phone), SysUser::getPhone, phone); - queryWrapper.like(ObjectUtil.isNotEmpty(tel), SysUser::getTel, tel); - queryWrapper.like(ObjectUtil.isNotEmpty(superAdminFlag), SysUser::getSuperAdminFlag, superAdminFlag); - queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), SysUser::getStatusFlag, statusFlag); - queryWrapper.eq(ObjectUtil.isNotNull(loginCount), SysUser::getLoginCount, loginCount); - queryWrapper.like(ObjectUtil.isNotEmpty(lastLoginIp), SysUser::getLastLoginIp, lastLoginIp); - queryWrapper.eq(ObjectUtil.isNotNull(lastLoginTime), SysUser::getLastLoginTime, lastLoginTime); - queryWrapper.like(ObjectUtil.isNotEmpty(masterUserId), SysUser::getMasterUserId, masterUserId); - queryWrapper.like(ObjectUtil.isNotEmpty(expandField), SysUser::getExpandField, expandField); - queryWrapper.eq(ObjectUtil.isNotNull(versionFlag), SysUser::getVersionFlag, versionFlag); - queryWrapper.like(ObjectUtil.isNotEmpty(delFlag), SysUser::getDelFlag, delFlag); - queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysUser::getTenantId, tenantId); + // 根据状态进行查询 + Integer statusFlag = sysUserRequest.getStatusFlag(); + queryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag); + + // 按用户排序字段排序 + queryWrapper.orderByAsc(SysUser::getUserSort); return queryWrapper; }