opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !527 from 追梦稻草人Li/dev

Browse Source
This commit is contained in:
追梦稻草人Li 2024-05-09 08:52:46 +00:00 committed by Gitee
commit 1996fdaaf3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
View File

@ -71,7 +71,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
@Override
public String selectConfigByKey(String configKey) {
SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
.eq(SysConfig::getConfigKey, configKey));
.eq(SysConfig::getConfigKey, configKey), false);
if (ObjectUtil.isNotNull(retConfig)) {
return retConfig.getConfigValue();
}
@ -80,6 +80,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
/**
* 获取注册开关
*
* @param tenantId 租户id
* @return true开启，false关闭
*/
@ -87,7 +88,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
public boolean selectRegisterEnabled(String tenantId) {
SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> {
return baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
.eq(SysConfig::getConfigKey, "sys.account.registerUser"));
.eq(SysConfig::getConfigKey, "sys.account.registerUser"), false);
});
if (ObjectUtil.isNull(retConfig)) {
return false;
@ -197,7 +198,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
@Override
public boolean checkConfigKeyUnique(SysConfigBo config) {
long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()), false);
if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) {
return false;
}

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
View File

@ -73,7 +73,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
return baseMapper.selectOne(new LambdaQueryWrapper<SysDictData>()
.select(SysDictData::getDictLabel)
.eq(SysDictData::getDictType, dictType)
.eq(SysDictData::getDictValue, dictValue))
.eq(SysDictData::getDictValue, dictValue), false)
.getDictLabel();
}
@ -146,7 +146,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
public boolean checkDictDataUnique(SysDictDataBo dict) {
Long dictCode = ObjectUtil.isNull(dict.getDictCode()) ? -1L : dict.getDictCode();
SysDictData entity = baseMapper.selectOne(new LambdaQueryWrapper<SysDictData>()
.eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue()));
.eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue()), false);
if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) {
return false;
}

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
View File

@ -150,7 +150,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
long ossConfigId = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysOssConfig>()
.select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()), false);
if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
return false;
}

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

@ -569,7 +569,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public String selectUserNameById(Long userId) {
SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getUserName).eq(SysUser::getUserId, userId));
.select(SysUser::getUserName).eq(SysUser::getUserId, userId), false);
return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName();
}
@ -583,7 +583,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId")
public String selectNicknameById(Long userId) {
SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getNickName).eq(SysUser::getUserId, userId));
.select(SysUser::getNickName).eq(SysUser::getUserId, userId),false);
return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName();
}
@ -614,7 +614,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public String selectPhonenumberById(Long userId) {
SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
.select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId),false);
return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber();
}
@ -627,7 +627,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public String selectEmailById(Long userId) {
SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
.select(SysUser::getEmail).eq(SysUser::getUserId, userId));
.select(SysUser::getEmail).eq(SysUser::getUserId, userId),false);
return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();
}

6
ruoyi-modules/ruoyi-workflow/pom.xml
View File

@ -85,26 +85,32 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-excel</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java
View File

@ -45,7 +45,7 @@ public class ActHiProcinstServiceImpl implements IActHiProcinstService {
public ActHiProcinst selectByBusinessKey(String businessKey) {
return baseMapper.selectOne(new LambdaQueryWrapper<ActHiProcinst>()
.eq(ActHiProcinst::getBusinessKey, businessKey)
.eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId()));
.eq(TenantHelper.isEnable(), ActHiProcinst::getTenantId, TenantHelper.getTenantId()), false);
}
}

2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java
View File

@ -124,6 +124,6 @@ public class WfCategoryServiceImpl implements IWfCategoryService {
*/
@Override
public WfCategory queryByCategoryCode(String categoryCode) {
return baseMapper.selectOne(new LambdaQueryWrapper<WfCategory>().eq(WfCategory::getCategoryCode, categoryCode));
return baseMapper.selectOne(new LambdaQueryWrapper<WfCategory>().eq(WfCategory::getCategoryCode, categoryCode), false);
}
}

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java
View File

@ -81,7 +81,7 @@ public class WfTaskBackNodeServiceImpl implements IWfTaskBackNodeService {
LambdaQueryWrapper<WfTaskBackNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId);
queryWrapper.eq(WfTaskBackNode::getNodeId, nodeId);
return wfTaskBackNodeMapper.selectOne(queryWrapper);
return wfTaskBackNodeMapper.selectOne(queryWrapper, false);
}
@Override
@ -91,7 +91,7 @@ public class WfTaskBackNodeServiceImpl implements IWfTaskBackNodeService {
LambdaQueryWrapper<WfTaskBackNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(WfTaskBackNode::getInstanceId, processInstanceId);
queryWrapper.eq(WfTaskBackNode::getNodeId, targetActivityId);
WfTaskBackNode actTaskNode = wfTaskBackNodeMapper.selectOne(queryWrapper);
WfTaskBackNode actTaskNode = wfTaskBackNodeMapper.selectOne(queryWrapper, false);
if (ObjectUtil.isNotNull(actTaskNode)) {
Integer orderNo = actTaskNode.getOrderNo();
List<WfTaskBackNode> taskNodeList = getListByInstanceId(processInstanceId);