From a0ab2e87ba8e7cb931ee09ffe20581aa323718e5 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Mon, 12 May 2025 13:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/flow/service/impl/SysFlowClassRuleServiceImpl.java   | 5 +++++
 .../frame/sys/flow/service/impl/SysFlowClassServiceImpl.java | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassRuleServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassRuleServiceImpl.java
index 23b72134..ed3a58c8 100644
--- a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassRuleServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassRuleServiceImpl.java
@@ -2,6 +2,7 @@ package com.hzya.frame.sys.flow.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -109,6 +110,7 @@ public class SysFlowClassRuleServiceImpl extends BaseService<SysFlowClassRuleEnt
 		}
 		SysFlowClassRuleEntity deleteRuleEntity = new SysFlowClassRuleEntity();
 		deleteRuleEntity.setFlowClassId(ruleEntity.getFlowClassId());
+		deleteRuleEntity.setUserId(ruleEntity.getUserId());
 		sysFlowClassRuleDao.logicRemoveMultiCondition(deleteRuleEntity);
 		return BaseResult.getSuccessMessageEntity("删除成功");
 	}
@@ -162,6 +164,9 @@ public class SysFlowClassRuleServiceImpl extends BaseService<SysFlowClassRuleEnt
 	@Override
 	public JsonResultEntity queryUserList(JSONObject object) {
 		SysUserEntity userEntity = getData("jsonStr",object,SysUserEntity.class);
+		if (StrUtil.isEmpty(userEntity.getFlowClassId())){
+			return BaseResult.getFailureMessageEntity("flowClassId不能为空");
+		}
 		List<SysUserEntity> sysUserEntities = sysUserDao.queryList(userEntity, "com.hzya.frame.sysnew.user.dao.impl.SysUserDaoImpl.entity_list_notin_sys_flowClass");
 		return BaseResult.getSuccessMessageEntity("查询成功",sysUserEntities);
 	}
diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassServiceImpl.java
index dc776677..ced25510 100644
--- a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassServiceImpl.java
+++ b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowClassServiceImpl.java
@@ -12,6 +12,7 @@ import com.hzya.frame.sys.flow.entity.SysFlowEntity;
 import com.hzya.frame.sys.flow.service.ISysFlowClassService;
 import com.hzya.frame.sysnew.user.dao.ISysUserDao;
 import com.hzya.frame.sysnew.user.entity.SysUserEntity;
+import com.hzya.frame.uuid.UUIDLong;
 import com.hzya.frame.uuid.UUIDUtils;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
@@ -93,6 +94,7 @@ public class SysFlowClassServiceImpl extends BaseService<SysFlowClassEntity, Str
 		ruleEntity.setModify_time(new Date());
 		ruleEntity.setCreate_user_id(flowClass.getCreate_user_id());
 		ruleEntity.setModify_user_id(flowClass.getModify_user_id());
+		ruleEntity.setId(UUIDUtils.getUUID());
 		flowClassRuleDao.save(ruleEntity);
 		return BaseResult.getSuccessMessageEntity("新增成功");
 	}