From c4eddf6f793986516c919add6493ad2be2c63b82 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 13:57:47 +0800
Subject: [PATCH] 修改flow基础代码,添加设备岗位查询用户
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
index 3311b89..f989792 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
@@ -6,17 +6,18 @@
import com.google.common.collect.Lists;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.flowable.apithird.entity.SysCategory;
import org.jeecg.modules.flowable.apithird.entity.SysRole;
import org.jeecg.modules.flowable.apithird.entity.SysUser;
import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.impl.SysRoleServiceImpl;
import org.jeecg.modules.system.service.impl.SysUserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +35,8 @@
SysUserServiceImpl sysUserService;
@Autowired
SysRoleServiceImpl sysRoleService;
+ @Autowired
+ ISysDictService sysDictService;
@Override
public SysUser getLoginUser() {
LoginUser sysUser = null;
@@ -81,27 +84,19 @@
}
@Override
public List<SysCategory> getAllCategory() {
- // todo 鑾峰彇娴佺▼鍒嗙被淇℃伅锛屾澶勪负渚嬪瓙
- SysCategory category1 = new SysCategory();
- category1.setId("drApproval");
- category1.setName("瀵煎叆瀹℃壒娴佺▼");
- SysCategory category2 = new SysCategory();
- category2.setId("ggApproval");
- category2.setName("璁捐鏇存敼鍗曟祦绋�");
- SysCategory category3 = new SysCategory();
- category3.setId("jjApproval");
- category3.setName("鏈哄姞宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category4 = new SysCategory();
- category4.setId("lsApproval");
- category4.setName("涓存椂宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category5 = new SysCategory();
- category5.setId("fxApproval");
- category5.setName("杩斾慨宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category6 = new SysCategory();
- category6.setId("jjggApproval");
- category6.setName("鏈哄姞鏇存敼鍗曟祦绋�");
- ArrayList<SysCategory> sysCategories = Lists.newArrayList(category1,category2,category3,category4,category5,category6);
- return sysCategories;
+ List<DictModel> list = sysDictService.getDictItems("flow_type");
+ List<SysCategory> categoryList = Lists.newArrayList();
+ if (list == null || list.isEmpty()) {
+ return null;
+ }else {
+ list.forEach(o -> {
+ SysCategory sysCategory = new SysCategory();
+ sysCategory.setId(o.getValue());
+ sysCategory.setName(o.getText());
+ categoryList.add(sysCategory);
+ });
+ }
+ return categoryList;
}
@Override
--
Gitblit v1.9.3