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

remove 删除无用注释 添加非空校验

Browse Source
This commit is contained in:
songgaoshuai 2024-01-18 18:04:18 +08:00
parent 3e44e16857
commit 8b9af5358c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@ -238,7 +238,6 @@ public class ActModelServiceImpl implements IActModelService {
}); });
model.setKey(key); model.setKey(key);
repositoryService.saveModel(model); repositoryService.saveModel(model);
// 解决设计器选择设置流程发起人设置变量有问题
JsonNode jsonNode = objectMapper.readTree(values.getFirst("json_xml")); JsonNode jsonNode = objectMapper.readTree(values.getFirst("json_xml"));
// 校验流程标识 // 校验流程标识
String processId = jsonNode.get("properties").get("process_id").textValue(); String processId = jsonNode.get("properties").get("process_id").textValue();
@ -382,7 +381,7 @@ public class ActModelServiceImpl implements IActModelService {
public ResultListDataRepresentation getUsers(String filter) { public ResultListDataRepresentation getUsers(String filter) {
LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
wrapper.like(org.dromara.common.core.utils.StringUtils.isNotBlank(filter), SysUser::getNickName, filter); wrapper.like(StringUtils.isNotBlank(filter), SysUser::getNickName, filter);
List<SysUser> sysUsers = sysUserMapper.selectList(wrapper); List<SysUser> sysUsers = sysUserMapper.selectList(wrapper);
List<UserRepresentation> userRepresentations = new ArrayList<>(); List<UserRepresentation> userRepresentations = new ArrayList<>();
for (SysUser sysUser : sysUsers) { for (SysUser sysUser : sysUsers) {

3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
View File

@ -322,6 +322,9 @@ public class WorkflowUtils {
* @param businessKey 业务id * @param businessKey 业务id
*/ */
public static void setProcessInstanceVo(Object obj, String businessKey) { public static void setProcessInstanceVo(Object obj, String businessKey) {
if (StringUtils.isBlank(businessKey)) {
return;
}
ActHiProcinst actHiProcinst = I_ACT_HI_PROCINST_SERVICE.selectByBusinessKey(businessKey); ActHiProcinst actHiProcinst = I_ACT_HI_PROCINST_SERVICE.selectByBusinessKey(businessKey);
if (actHiProcinst == null) { if (actHiProcinst == null) {
ProcessInstanceVo processInstanceVo = new ProcessInstanceVo(); ProcessInstanceVo processInstanceVo = new ProcessInstanceVo();