From 0d6d0d1cc263876e00850d076d5c4703a0392ce5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 04 四月 2023 09:48:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 2 +-
src/main/java/com/lf/server/service/show/ApplyService.java | 6 +++++-
data/db_tab.sql | 2 +-
data/db_cx.sql | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 1c16e54..d1cfa1c 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -24,8 +24,8 @@
select * from lf.sys_meta where id in (1411, 1412, 8, 2140);
select * from lf.sys_meta order by id;
select * from bs.s_explorationpointstratum;
-
-
+select * from lf.sys_user where uid = 'admin'
+select * from lf.sys_dep order by id
diff --git a/data/db_tab.sql b/data/db_tab.sql
index b369eed..20149c2 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -449,7 +449,7 @@
comment on column lf.sys_role.depid is '鍗曚綅ID';
comment on column lf.sys_role.name is '鍚嶇О';
comment on column lf.sys_role.descr is '鎻忚堪';
-comment on column lf.sys_role.is_admin is '鏄�/鍚︿负绠＄悊鍛橈細0-鏅�氫細鍛橈紝1-瓒呯骇绠＄悊鍛橈紝2-鏁版嵁绠＄悊鍛�';
+comment on column lf.sys_role.is_admin is '瑙掕壊绫诲埆锛�0-鏅�氱敤鎴凤紝1-瓒呯骇绠＄悊鍛橈紝2-鏁版嵁绠＄悊鍛橈紝3-棰嗗';
comment on column lf.sys_role.create_user is '鍒涘缓浜篒D';
comment on column lf.sys_role.create_time is '鍒涘缓鏃堕棿';
comment on column lf.sys_role.update_user is '鏇存柊浜篒D';
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 2ebfb20..3483cbb 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -8,6 +8,7 @@
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.show.ApplyMapper;
+import com.lf.server.service.sys.UserService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,9 @@
@Autowired
FlowService flowService;
+
+ @Autowired
+ UserService userService;
@Autowired
DataLibService dataLibService;
@@ -177,7 +181,7 @@
for (String depcode : dr.getDepcodes()) {
UserEntity user = selectUserByDepcode(depcode);
if (null == user) {
- continue;
+ user = userService.selectByUid(StaticData.ADMIN);
}
FlowEntity flow = new FlowEntity();
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 2f7056a..da47e84 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -128,7 +128,7 @@
}
for (String id : ids) {
- // || "00".equals(id)
+ // || "00".equals(id)
if (StringHelper.isEmpty(id)) {
continue;
}
--
Gitblit v1.9.3