From d6e33e1daa6118dd6e799907eb3d8bc312f785b8 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 十二月 2025 18:15:19 +0800
Subject: [PATCH] 仓库查询过滤优化
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 28 +++++++++++-----------------
fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java | 9 +++++----
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 3 +--
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 2 +-
4 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index d95b23a..665ae8e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -59,8 +59,7 @@
*/
public List<Dept> getDeptData() {
SysUser user = ContextUtil.getLoginUser();
- SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
- if (Constant.DEPT_TYPE_20.equals(userDept.getType())) {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
return this.listDept(ContextUtil.subDeptId(user),null,null);
}else {
return this.listDept(null,null,user.getDeptId() + "%");
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index 6142cb8..6406358 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -43,7 +43,7 @@
QueryWrapper<Depot> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", companyId);
if(StringUtils.isNotBlank(deptId)){
- queryWrapper.eq("dept_id", deptId);
+ queryWrapper.likeRight("dept_id", deptId);
}
if(idDesc){
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index d522c31..7d42514 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -99,54 +99,48 @@
<DataColumn name="id">
<Property name="property">id</Property>
<Property name="align">center</Property>
- <Property name="width">160</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="deptId">
+ <Property name="property">deptId</Property>
+ <Property name="align">left</Property>
</DataColumn>
<DataColumn name="depotStatus">
<Property name="property">depotStatus</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodType">
- <Property name="property">foodType</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodLevel">
- <Property name="property">foodLevel</Property>
- <Property name="align">center</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="storageReal">
<Property name="property">storageReal</Property>
<Property name="align">center</Property>
+ <Property name="width">150</Property>
</DataColumn>
<DataColumn name="foodYear">
<Property name="property">foodYear</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="foodLocation">
- <Property name="property">foodLocation</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="storeDate">
<Property name="property">storeDate</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="storeKeeperName">
<Property name="property">storeKeeperName</Property>
<Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn name="depotType">
<Property name="property">depotType</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="updateBy">
- <Property name="property">updateBy</Property>
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
index 46da167..e980207 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SelectDeptPR.java
@@ -1,6 +1,7 @@
package com.fzzy.igds;
import com.bstek.dorado.annotation.DataProvider;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Company;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreCompanyService;
@@ -37,12 +38,12 @@
//鑾峰彇褰撳墠鐧诲綍浜�
SysUser user = ContextUtil.getLoginUser();
- if(FrameworkConfig.getCompanyId().equals(user.getCompanyId())){
- //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
- return companyService.listCompany(null, user.getCompanyId(), null);
- }else {
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
//鏀跺偍鍏徃璐﹀彿锛屽彧鑾峰彇褰撳墠鍏徃淇℃伅
return companyService.listCompany(user.getCompanyId(), null, null);
+ }else {
+ //绯荤粺鐩戠璐﹀彿锛岃幏鍙栫粍缁囦笅鎵�鏈夊叕鍙镐俊鎭�
+ return companyService.listCompany(null, user.getCompanyId(), null);
}
}
--
Gitblit v1.9.3