public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-04-24 03:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 升级 warm-flow 1.6.7 同步vue版本按钮权限相关代码

Browse Source
This commit is contained in:
疯狂的狮子Li
2025-03-11 14:13:33 +08:00
parent 339cc28249
commit cf8bf6a8b5
33 changed files with 950 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
View File

@@ -103,6 +103,11 @@ public class SysUserBo extends BaseEntity {
*/
private Long roleId;
/**
* 用户ID
*/
private String userIds;
/**
* 排除不查询的用户(工作流用)
*/

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java
View File

@@ -5,7 +5,9 @@ import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteDictService;
import org.dromara.system.api.domain.vo.RemoteDictDataVo;
import org.dromara.system.api.domain.vo.RemoteDictTypeVo;
import org.dromara.system.domain.vo.SysDictDataVo;
import org.dromara.system.domain.vo.SysDictTypeVo;
import org.dromara.system.service.ISysDictTypeService;
import org.springframework.stereotype.Service;
@@ -23,6 +25,12 @@ public class RemoteDictServiceImpl implements RemoteDictService {
private final ISysDictTypeService sysDictTypeService;
@Override
public RemoteDictTypeVo selectDictTypeByType(String dictType) {
SysDictTypeVo vo = sysDictTypeService.selectDictTypeByType(dictType);
return MapstructUtils.convert(vo, RemoteDictTypeVo.class);
}
/**
* 根据字典类型查询字典数据
*

10
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java
View File

@@ -15,11 +15,17 @@ import java.util.List;
*/
public interface ISysUserService {
/**
* 根据条件分页查询用户列表
*
* @param user 用户信息
* @param pageQuery 发呢也
* @return 用户信息
*/
TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery);
/**
* 根据条件分页查询用户列表
* 导出用户列表
*
* @param user 用户信息
* @return 用户信息集合信息

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
View File

@@ -117,6 +117,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
* @param dictType 字典类型
* @return 字典类型
*/
@Cacheable(cacheNames = CacheNames.SYS_DICT_TYPE, key = "#dictType")
@Override
public SysDictTypeVo selectDictTypeByType(String dictType) {
return baseMapper.selectVoOne(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
@@ -136,6 +137,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
}
CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType());
CacheUtils.evict(CacheNames.SYS_DICT_TYPE, dictType.getDictType());
}
baseMapper.deleteByIds(Arrays.asList(dictIds));
}
@@ -146,6 +148,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
@Override
public void resetDictCache() {
CacheUtils.clear(CacheNames.SYS_DICT);
CacheUtils.clear(CacheNames.SYS_DICT_TYPE);
}
/**

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@@ -75,6 +75,7 @@ public class SysUserServiceImpl implements ISysUserService {
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", SystemConstants.NORMAL)
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
.in(StringUtils.isNotBlank(user.getUserIds()), "u.user_id", StringUtils.splitTo(user.getUserIds(), Convert::toLong))
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())