From 25c18d63f3310b5d762b88c750b8007045c2a44d Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 12 三月 2026 10:34:14 +0800
Subject: [PATCH] 出入库配置查询，显示调整
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml | 7 +++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
index c76b494..9e1c04f 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutConfService.java
@@ -5,10 +5,10 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.mapper.InoutConfMapper;
-import com.fzzy.igds.mapper.InoutSysConfMapper;
import com.fzzy.igds.domain.InoutConf;
import com.fzzy.igds.domain.InoutSysConf;
+import com.fzzy.igds.mapper.InoutConfMapper;
+import com.fzzy.igds.mapper.InoutSysConfMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -193,6 +193,8 @@
if (StringUtils.isNotEmpty(deptId)) {
queryWrapper.eq("dept_id", deptId);
+ }else {
+ queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
}
return inoutConfMapper.selectList(queryWrapper);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml
index 101e218..a192bd1 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConf.view.xml
@@ -335,6 +335,12 @@
<Property name="property">sort</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn>
+ <Property name="property">deptId</Property>
+ <Property name="name">deptId</Property>
+ <Property name="width">300</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="align">center</Property>
@@ -356,6 +362,7 @@
</DataColumn>
<DataColumn name="protocol">
<Property name="property">protocol</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="updateBy">
<Property name="property">updateBy</Property>
--
Gitblit v1.9.3