diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql index b883f2c7b..55e0c09ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql @@ -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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql index 4bbf51706..edb5ac9a0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql @@ -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 diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue index 6e136b643..66207849c 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue @@ -35,7 +35,7 @@ @current-change="handleCurrentChange" > - +