root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-01-04 17:41:19 +08:00
parent d66a7bbfa8
commit 5fe2cbe618
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql
View File

@@ -112,13 +112,14 @@
IF 输入.flag = "3"
PAGEQUERY
SELECT
sys_user.*,
dept.name
sys_user.*,
dept.name
FROM
sys_user sys_user
LEFT JOIN sys_dept dept ON dept.dept_id = sys_user.dept_id
sys_user sys_user
LEFT JOIN sys_user_dept sdept ON sdept.user_id = sys_user.user_id
LEFT JOIN sys_dept dept ON dept.dept_id = sdept.dept_id
WHERE
sys_user.enabled = '1'
sys_user.is_used = '1'
OPTION 输入.blurry <> ""
(
username like 输入.blurry

2
lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql
View File

@@ -54,7 +54,7 @@
PDM_BI_PersonCorrDevice personDevice
LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id
WHERE
user.enabled = '1'
user.is_used = '1'
GROUP BY
personDevice.jockey_id
) view_person

2
lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
View File

@@ -35,7 +35,7 @@
@current-change="handleCurrentChange"
>
<el-table-column show-overflow-tooltip prop="username" label="用户名"/>
<el-table-column show-overflow-tooltip prop="nick_name" label="姓名"/>
<el-table-column show-overflow-tooltip prop="person_name" label="姓名"/>
<el-table-column prop="name" label="部门"/>
<!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
<template slot-scope="scope">