From d80f3300905b7c4fffed59d8fa78491065aa181b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 16:26:15 +0800
Subject: [PATCH] 用户编号搜索和调拨明细只显示本机构及下级
---
admin-web/src/views/systemManger/server/user/index.vue | 5 ++---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 2 ++
admin-web/src/views/systemManger/server/user/items.js | 2 +-
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/admin-web/src/views/systemManger/server/user/index.vue b/admin-web/src/views/systemManger/server/user/index.vue
index 0a651d3..2d13d56 100644
--- a/admin-web/src/views/systemManger/server/user/index.vue
+++ b/admin-web/src/views/systemManger/server/user/index.vue
@@ -58,9 +58,8 @@
// 鎼滅储鏉′欢
filterFrom: {
tenantCode: 0,
- trnantId: 0,
userName: null,
- userPhone: null,
+ userCode: null,
},
curOrgId: null,
// 娣诲姞&缂栬緫璁剧疆
@@ -292,7 +291,7 @@
reset() {
this.filterFrom.tenantCode = null;
this.filterFrom.userName = null;
- this.filterFrom.userPhone = null;
+ this.filterFrom.userCode = null;
this.filterFrom.status = 1;
this.search(1);
},
diff --git a/admin-web/src/views/systemManger/server/user/items.js b/admin-web/src/views/systemManger/server/user/items.js
index b76f203..d843f60 100644
--- a/admin-web/src/views/systemManger/server/user/items.js
+++ b/admin-web/src/views/systemManger/server/user/items.js
@@ -8,7 +8,7 @@
},
{
type: 'text',
- dataIndex: 'userPhone',
+ dataIndex: 'userCode',
label: '缂栧彿',
placeholder: "璇疯緭鍏�",
defaultValue: ''
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 27149d7..8efad14 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -237,6 +237,8 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+ String tenantId = sysInfo.getTenantId();
+ param.setInAgencyId(Long.valueOf(tenantId));
GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
return ResponseValue.success(mapGenericPager);
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 383bc3c..4261eb3 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -644,11 +644,11 @@
}
if (param.getOutAgencyId() != null) {
sql.append("AND ft.OUT_AGENCY_ID like :outAgencyId ");
- params.put("outAgencyId", param.getOutAgencyId());
+ params.put("outAgencyId", param.getOutAgencyId() + StringUtils.CHAR_PERCENT);
}
- if (param.getOutAgencyId() != null) {
+ if (param.getInAgencyId() != null) {
sql.append("AND ft.IN_AGENCY_ID like :inAgencyId ");
- params.put("inAgencyId", param.getInAgencyId());
+ params.put("inAgencyId", param.getInAgencyId() + StringUtils.CHAR_PERCENT);
}
if (StringUtils.isNotEmpty(param.getOperatorName())) {
sql.append("AND ft.OPERATOR_NAME = :operatorName ");
--
Gitblit v1.9.1