gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】优化导包、前端page-select组件优化搜索+分页

pull/239/head v3.3.1
俞宝山 2024-10-29 13:13:57 +08:00
parent dd4d0bd791
commit f8ff3686a2
25 changed files with 94 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
snowy-admin-web/src/components/XnPageSelect/index.vue
View File

@ -1,6 +1,23 @@
<template>
<a-spin size="small" :spinning="spinning">
<!-- 重写两边是因为可能是个antdv的bug影响到我们的控制台输出错误 -->
<a-select
v-if="props.showSearch"
v-model:value="modelValue"
:options="options"
:field-names="{ label: 'name', value: 'id' }"
class="xn-wd"
:placeholder="props.placeholder"
:allow-clear="props.allowClear"
:disabled="props.disabled"
:filterOption="!props.showSearch"
show-search
@change="handleChange"
@search="handleSearch"
@popupScroll="handlePopupScroll"
/>
<a-select
v-else
v-model:value="modelValue"
:options="options"
:field-names="{ label: 'name', value: 'id' }"
@ -8,7 +25,6 @@
:placeholder="props.placeholder"
:allow-clear="props.allowClear"
:disabled="props.disabled"
:showSearch="props.showSearch"
:filterOption="!props.showSearch"
@change="handleChange"
@onSearch="handleSearch"

1
snowy-common/src/main/java/vip/xiaonuo/common/util/CommonJoinPointUtil.java
View File

@ -15,7 +15,6 @@ package vip.xiaonuo.common.util;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import jakarta.servlet.http.HttpServletRequest;

2
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
View File

@ -424,7 +424,7 @@ public class AuthServiceImpl implements AuthService {
*/
private void fillSaBaseClientLoginUserAndUpdateCache(SaBaseClientLoginUser saBaseClientLoginUser) {
// 角色集合
List<JSONObject> roleList = loginUserApi.getRoleListByUserId(saBaseClientLoginUser.getId());
List<JSONObject> roleList = clientLoginUserApi.getRoleListByUserId(saBaseClientLoginUser.getId());
// 角色id集合
List<String> roleIdList = roleList.stream().map(jsonObject -> jsonObject.getStr("id")).collect(Collectors.toList());
// 角色码集合

3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/controller/BizIndexController.java
View File

@ -17,6 +17,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@ -28,7 +29,7 @@ import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowDetailResult;
import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowListResult;
import vip.xiaonuo.biz.modular.index.service.BizIndexService;
import vip.xiaonuo.common.pojo.CommonResult;
import jakarta.validation.Valid;
import java.util.List;
/**

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/BizIndexService.java
View File

@ -12,6 +12,7 @@
*/
package vip.xiaonuo.biz.modular.index.service;
import jakarta.validation.Valid;
import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeIdParam;
import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeListParam;
import vip.xiaonuo.biz.modular.index.param.BizIndexSlideshowListParam;
@ -19,7 +20,6 @@ import vip.xiaonuo.biz.modular.index.result.BizIndexNoticeListResult;
import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowDetailResult;
import vip.xiaonuo.biz.modular.index.result.BizIndexSlideshowListResult;
import jakarta.validation.Valid;
import java.util.List;
/**

1
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java
View File

@ -29,6 +29,7 @@ import vip.xiaonuo.biz.modular.notice.entity.BizNotice;
import vip.xiaonuo.biz.modular.notice.enums.BizNoticeStatusEnum;
import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
import vip.xiaonuo.dev.api.DevSlideshowApi;
import java.util.List;
import java.util.stream.Collectors;

12
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/controller/BizNoticeController.java
View File

@ -14,25 +14,25 @@ package vip.xiaonuo.biz.modular.notice.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import vip.xiaonuo.common.annotation.CommonLog;
import vip.xiaonuo.common.pojo.CommonResult;
import vip.xiaonuo.biz.modular.notice.entity.BizNotice;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeAddParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeEditParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeIdParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticePageParam;
import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
import vip.xiaonuo.common.annotation.CommonLog;
import vip.xiaonuo.common.pojo.CommonResult;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import java.util.List;
/**

3
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/entity/BizNotice.java
View File

@ -12,7 +12,8 @@
*/
package vip.xiaonuo.biz.modular.notice.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/param/BizNoticeAddParam.java
View File

@ -13,9 +13,9 @@
package vip.xiaonuo.biz.modular.notice.param;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
/**
* 通知公告添加参数

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/param/BizNoticeEditParam.java
View File

@ -13,9 +13,9 @@
package vip.xiaonuo.biz.modular.notice.param;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
/**
* 通知公告编辑参数

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/param/BizNoticeIdParam.java
View File

@ -13,9 +13,9 @@
package vip.xiaonuo.biz.modular.notice.param;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
/**
* 通知公告Id参数

10
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/notice/service/impl/BizNoticeServiceImpl.java
View File

@ -22,17 +22,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vip.xiaonuo.biz.modular.notice.enums.BizNoticeStatusEnum;
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
import vip.xiaonuo.common.exception.CommonException;
import vip.xiaonuo.common.page.CommonPageRequest;
import vip.xiaonuo.biz.modular.notice.entity.BizNotice;
import vip.xiaonuo.biz.modular.notice.enums.BizNoticeStatusEnum;
import vip.xiaonuo.biz.modular.notice.mapper.BizNoticeMapper;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeAddParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeEditParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticeIdParam;
import vip.xiaonuo.biz.modular.notice.param.BizNoticePageParam;
import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
import vip.xiaonuo.common.exception.CommonException;
import vip.xiaonuo.common.page.CommonPageRequest;
import java.util.List;
@ -69,7 +69,7 @@ public class BizNoticeServiceImpl extends ServiceImpl<BizNoticeMapper, BizNotice
queryWrapper.orderBy(true, bizNoticePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
StrUtil.toUnderlineCase(bizNoticePageParam.getSortField()));
} else {
queryWrapper.lambda().orderByAsc(BizNotice::getId);
queryWrapper.lambda().orderByAsc(BizNotice::getSortCode);
}
return this.page(CommonPageRequest.defaultPage(), queryWrapper);
}

1
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java
View File

@ -49,7 +49,6 @@ import org.springframework.stereotype.Component;
import vip.xiaonuo.auth.core.pojo.SaBaseClientLoginUser;
import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
import vip.xiaonuo.auth.core.util.StpClientLoginUserUtil;
import vip.xiaonuo.auth.core.util.StpClientUtil;
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
import vip.xiaonuo.common.annotation.CommonLog;
import vip.xiaonuo.dev.modular.log.util.DevLogUtil;

2
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/dev/DevApiProvider.java
View File

@ -22,8 +22,6 @@ import vip.xiaonuo.dev.modular.dict.enums.DevDictCategoryEnum;
import vip.xiaonuo.dev.modular.dict.service.DevDictService;
import vip.xiaonuo.dev.modular.email.service.DevEmailService;
import vip.xiaonuo.dev.modular.file.service.DevFileService;
import vip.xiaonuo.dev.modular.job.entity.DevJob;
import vip.xiaonuo.dev.modular.job.enums.DevJobStatusEnum;
import vip.xiaonuo.dev.modular.job.service.DevJobService;
import vip.xiaonuo.dev.modular.message.service.DevMessageService;
import vip.xiaonuo.dev.modular.sms.service.DevSmsService;

9
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/controller/DevSlideshowController.java
View File

@ -13,8 +13,11 @@
package vip.xiaonuo.dev.modular.slideshow.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -28,9 +31,7 @@ import vip.xiaonuo.dev.modular.slideshow.param.DevSlideshowEditParam;
import vip.xiaonuo.dev.modular.slideshow.param.DevSlideshowIdParam;
import vip.xiaonuo.dev.modular.slideshow.param.DevSlideshowPageParam;
import vip.xiaonuo.dev.modular.slideshow.service.DevSlideshowService;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import java.util.List;
/**

3
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/entity/DevSlideshow.java
View File

@ -12,7 +12,8 @@
*/
package vip.xiaonuo.dev.modular.slideshow.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;

7
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/param/DevSlideshowAddParam.java
View File

@ -13,13 +13,10 @@
package vip.xiaonuo.dev.modular.slideshow.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
/**
* 轮播图添加参数

7
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/param/DevSlideshowEditParam.java
View File

@ -13,13 +13,10 @@
package vip.xiaonuo.dev.modular.slideshow.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
/**
* 轮播图编辑参数

3
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/param/DevSlideshowIdParam.java
View File

@ -13,11 +13,10 @@
package vip.xiaonuo.dev.modular.slideshow.param;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import jakarta.validation.constraints.NotBlank;
/**
* 轮播图Id参数
*

2
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/slideshow/param/DevSlideshowPageParam.java
View File

@ -15,8 +15,6 @@ package vip.xiaonuo.dev.modular.slideshow.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
/**
* 轮播图查询参数

2
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/service/impl/DevSmsServiceImpl.java
View File

@ -17,7 +17,6 @@ import cn.hutool.core.collection.CollStreamUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -26,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
import vip.xiaonuo.common.exception.CommonException;
import vip.xiaonuo.common.page.CommonPageRequest;
import vip.xiaonuo.dev.api.DevConfigApi;
import vip.xiaonuo.dev.modular.sms.entity.DevSms;
import vip.xiaonuo.dev.modular.sms.enums.DevSmsEngineTypeEnum;
import vip.xiaonuo.dev.modular.sms.mapper.DevSmsMapper;

19
snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
View File

@ -82,9 +82,10 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
public void add(MobileMenuAddParam mobileMenuAddParam) {
MobileMenu mobileMenu = BeanUtil.toBean(mobileMenuAddParam, MobileMenu.class);
boolean repeatTitle = this.count(new LambdaQueryWrapper<MobileMenu>().eq(MobileMenu::getParentId, mobileMenu.getParentId())
.eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue()).eq(MobileMenu::getTitle, mobileMenu.getTitle())) > 0;
.eq(MobileMenu::getModule, mobileMenu.getModule()).eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue())
.eq(MobileMenu::getTitle, mobileMenu.getTitle())) > 0;
if(repeatTitle) {
throw new CommonException("存在重复的菜单，名称为：{}", mobileMenu.getTitle());
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", mobileMenu.getTitle());
}
List<MobileMenu> originDataList = this.list(new LambdaQueryWrapper<MobileMenu>().eq(MobileMenu::getCategory,
MobileResourceCategoryEnum.MENU.getValue()));
@ -106,10 +107,11 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
MobileMenu mobileMenu = this.queryEntity(mobileMenuEditParam.getId());
BeanUtil.copyProperties(mobileMenuEditParam, mobileMenu);
boolean repeatTitle = this.count(new LambdaQueryWrapper<MobileMenu>().eq(MobileMenu::getParentId, mobileMenu.getParentId())
.eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue()).eq(MobileMenu::getTitle, mobileMenu.getTitle())
.eq(MobileMenu::getModule, mobileMenu.getModule()).eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue())
.eq(MobileMenu::getTitle, mobileMenu.getTitle())
.ne(MobileMenu::getId, mobileMenu.getId())) > 0;
if(repeatTitle) {
throw new CommonException("存在重复的菜单，名称为：{}", mobileMenu.getTitle());
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", mobileMenu.getTitle());
}
List<MobileMenu> originDataList = this.list(new LambdaQueryWrapper<MobileMenu>().eq(MobileMenu::getCategory,
MobileResourceCategoryEnum.MENU.getValue()));
@ -140,6 +142,15 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
MobileResourceCategoryEnum.MENU.getValue()));
List<MobileMenu> mobileMenuChildList = this.getChildListById(mobileMenuList, mobileMenu.getId(), true).stream()
.peek(mobileMenuTemp -> mobileMenuTemp.setModule(mobileMenuChangeModuleParam.getModule())).collect(Collectors.toList());
mobileMenuChildList.forEach(mobileMenuTemp -> {
boolean repeatTitle = this.count(new LambdaQueryWrapper<MobileMenu>().eq(MobileMenu::getParentId, mobileMenuTemp.getParentId())
.eq(MobileMenu::getModule, mobileMenuTemp.getModule()).eq(MobileMenu::getCategory, MobileResourceCategoryEnum.MENU.getValue())
.eq(MobileMenu::getTitle, mobileMenuTemp.getTitle())
.ne(MobileMenu::getId, mobileMenuTemp.getId())) > 0;
if(repeatTitle) {
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", mobileMenuTemp.getTitle());
}
});
this.updateBatchById(mobileMenuChildList);
}

1
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/provider/SysModuleApiProvider.java
View File

@ -17,6 +17,7 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import vip.xiaonuo.sys.api.SysModuleApi;
import vip.xiaonuo.sys.modular.resource.service.SysModuleService;
import java.util.List;
/**

19
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysMenuServiceImpl.java
View File

@ -149,9 +149,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
checkParam(sysMenuAddParam);
SysMenu sysMenu = BeanUtil.toBean(sysMenuAddParam, SysMenu.class);
boolean repeatTitle = this.count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, sysMenu.getParentId())
.eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue()).eq(SysMenu::getTitle, sysMenu.getTitle())) > 0;
.eq(SysMenu::getModule, sysMenu.getModule()).eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue())
.eq(SysMenu::getTitle, sysMenu.getTitle())) > 0;
if(repeatTitle) {
throw new CommonException("存在重复的菜单，名称为：{}", sysMenu.getTitle());
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", sysMenu.getTitle());
}
List<SysMenu> originDataList = this.list(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getCategory,
SysResourceCategoryEnum.MENU.getValue()));
@ -239,7 +240,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
checkParam(sysMenuEditParam);
BeanUtil.copyProperties(sysMenuEditParam, sysMenu);
boolean repeatTitle = this.count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, sysMenu.getParentId())
.eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue()).eq(SysMenu::getTitle, sysMenu.getTitle())
.eq(SysMenu::getModule, sysMenu.getModule()).eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue())
.eq(SysMenu::getTitle, sysMenu.getTitle())
.ne(SysMenu::getId, sysMenu.getId())) > 0;
// 不管是哪个改为菜单，设置组件为空
if(sysMenuEditParam.getMenuType().equals(SysResourceMenuTypeEnum.MENU.getValue())) {
@ -247,7 +249,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
sysMenuEditParam.setName(null);
}
if(repeatTitle) {
throw new CommonException("存在重复的菜单，名称为：{}", sysMenu.getTitle());
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", sysMenu.getTitle());
}
List<SysMenu> originDataList = this.list(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getCategory,
SysResourceCategoryEnum.MENU.getValue()));
@ -281,6 +283,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
SysResourceCategoryEnum.MENU.getValue()));
List<SysMenu> sysMenuChildList = this.getChildListById(sysMenuList, sysMenu.getId(), true).stream()
.peek(sysMenuTemp -> sysMenuTemp.setModule(sysMenuChangeModuleParam.getModule())).collect(Collectors.toList());
sysMenuChildList.forEach(sysMenuTemp -> {
boolean repeatTitle = this.count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, sysMenuTemp.getParentId())
.eq(SysMenu::getModule, sysMenuTemp.getModule()).eq(SysMenu::getCategory, SysResourceCategoryEnum.MENU.getValue())
.eq(SysMenu::getTitle, sysMenuTemp.getTitle())
.ne(SysMenu::getId, sysMenuTemp.getId())) > 0;
if(repeatTitle) {
throw new CommonException("同一模块中，相同父菜单下存在重复的子菜单，名称为：{}", sysMenuTemp.getTitle());
}
});
this.updateBatchById(sysMenuChildList);
}

14
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -709,7 +709,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
menuJsonObject.set("meta", metaJsonObject);
return menuJsonObject;
}).toList();
}).collect(Collectors.toList());
// 执行构造树
List<TreeNode<String>> treeNodeList = resultJsonObjectList.stream().map(jsonObject ->
@ -1529,6 +1529,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<SysOrg> getOrgListByIdList(SysUserIdListParam sysUserIdListParam) {
if (ObjectUtil.isEmpty(sysUserIdListParam.getIdList())) {
return CollectionUtil.newArrayList();
}
LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName, SysOrg::getCategory, SysOrg::getSortCode)
@ -1538,6 +1541,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<SysUser> getUserListByIdList(SysUserIdListParam sysUserIdListParam) {
if (ObjectUtil.isEmpty(sysUserIdListParam.getIdList())) {
return CollectionUtil.newArrayList();
}
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 只查询部分字段
lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAvatar, SysUser::getAccount, SysUser::getName,
@ -1548,6 +1554,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<SysPosition> getPositionListByIdList(SysUserIdListParam sysUserIdListParam) {
if (ObjectUtil.isEmpty(sysUserIdListParam.getIdList())) {
return CollectionUtil.newArrayList();
}
LambdaQueryWrapper<SysPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName,
@ -1558,6 +1567,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<SysRole> getRoleListByIdList(SysUserIdListParam sysUserIdListParam) {
if (ObjectUtil.isEmpty(sysUserIdListParam.getIdList())) {
return CollectionUtil.newArrayList();
}
LambdaQueryWrapper<SysRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName,