diff --git a/kernel-s-group/group-api/src/main/java/cn/stylefeng/roses/kernel/group/api/GroupApi.java b/kernel-s-group/group-api/src/main/java/cn/stylefeng/roses/kernel/group/api/GroupApi.java index 0ee66db4a..9fb776a48 100644 --- a/kernel-s-group/group-api/src/main/java/cn/stylefeng/roses/kernel/group/api/GroupApi.java +++ b/kernel-s-group/group-api/src/main/java/cn/stylefeng/roses/kernel/group/api/GroupApi.java @@ -38,7 +38,7 @@ import java.util.List; public interface GroupApi { /** - * 获取某个业务,某个人,某个分类下的业务数据id + * 获取当前用户某个业务,某个分类下的业务数据id * * @author fengshuonan * @date 2022/5/11 17:00 @@ -46,11 +46,13 @@ public interface GroupApi { List findUserGroupDataList(SysGroupRequest sysGroupRequest); /** - * 获取用户某个业务下的分组列表 + * 获取当前用户某个业务下的分组列表 * + * @param sysGroupRequest 请求参数,一般传递groupBizCode即可 + * @param getTotal 是否获取用户全部的数据 * @author fengshuonan * @date 2022/5/11 17:00 */ - List findGroupList(SysGroupRequest sysGroupRequest); + List findGroupList(SysGroupRequest sysGroupRequest, boolean getTotal); } diff --git a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/controller/SysGroupController.java b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/controller/SysGroupController.java index beac6b7b0..f63467e5c 100644 --- a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/controller/SysGroupController.java +++ b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/controller/SysGroupController.java @@ -41,7 +41,7 @@ public class SysGroupController { */ @GetResource(name = "获取列表", path = "/sysGroup/list") public ResponseData> list(@Validated(BaseRequest.list.class) SysGroupRequest sysGroupRequest) { - return new SuccessResponseData<>(groupApi.findGroupList(sysGroupRequest)); + return new SuccessResponseData<>(groupApi.findGroupList(sysGroupRequest, false)); } /** diff --git a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/SysGroupMapper.java b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/SysGroupMapper.java index c8dcb6714..f5c3fe3f8 100644 --- a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/SysGroupMapper.java +++ b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/SysGroupMapper.java @@ -21,6 +21,6 @@ public interface SysGroupMapper extends BaseMapper { * @author fengshuonan * @date 2022/5/11 16:49 */ - List getUserGroupList(@Param("groupBizCode") String groupBizCode, @Param("userId") Long userId); + List getUserGroupList(@Param("groupBizCode") String groupBizCode, @Param("userId") Long userId, @Param("getTotal") boolean getTotal); } diff --git a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/mapping/SysGroupMapper.xml b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/mapping/SysGroupMapper.xml index d1c5e11c0..dcba457db 100644 --- a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/mapping/SysGroupMapper.xml +++ b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/mapper/mapping/SysGroupMapper.xml @@ -6,8 +6,10 @@ select group_name, group_id, group_biz_code, business_id, user_id from sys_group where user_id = #{userId} - and group_biz_code = #{groupBizCode} - group by group_name + and group_biz_code = #{groupBizCode} + + group by group_name + diff --git a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/service/impl/SysGroupServiceImpl.java b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/service/impl/SysGroupServiceImpl.java index 3dcb2a300..ece67004c 100644 --- a/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/service/impl/SysGroupServiceImpl.java +++ b/kernel-s-group/group-business/src/main/java/cn/stylefeng/roses/kernel/group/modular/service/impl/SysGroupServiceImpl.java @@ -28,10 +28,10 @@ import java.util.stream.Collectors; public class SysGroupServiceImpl extends ServiceImpl implements SysGroupService, GroupApi { @Override - public List findGroupList(SysGroupRequest sysGroupRequest) { + public List findGroupList(SysGroupRequest sysGroupRequest, boolean getTotal) { String groupBizCode = sysGroupRequest.getGroupBizCode(); Long userId = LoginContext.me().getLoginUser().getUserId(); - List userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId); + List userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId, getTotal); // 增加两个固定的选中和取消选项 addAllGroup(groupBizCode, userGroupList); @@ -43,7 +43,7 @@ public class SysGroupServiceImpl extends ServiceImpl i public List addSelect(SysGroupRequest sysGroupRequest) { String groupBizCode = sysGroupRequest.getGroupBizCode(); Long userId = LoginContext.me().getLoginUser().getUserId(); - List userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId); + List userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId, false); // 增加两个固定的选中和取消选项 addCommonGroup(groupBizCode, userGroupList);