From d295f1f7706e51b158cb7252b6ac633b1f9a1982 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/resources/mappers/SystemDepartmentMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/resources/mappers/SystemDepartmentMapper.xml b/server/dmmall_service/src/main/resources/mappers/SystemDepartmentMapper.xml
index 0a57944..7f515ba 100644
--- a/server/dmmall_service/src/main/resources/mappers/SystemDepartmentMapper.xml
+++ b/server/dmmall_service/src/main/resources/mappers/SystemDepartmentMapper.xml
@@ -20,11 +20,11 @@
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME,
COUNT(usr.ID) USER_COUNT
- FROM SYSTEM_DEPARTMENT dept
- LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.DEPARTMENT_ID = dept.ID AND sdu.DELETED = 0
- LEFT JOIN `SYSTEM_USER` usr ON usr.ID = sdu.USER_ID AND usr.DELETED = 0
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = dept.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = dept.UPDATE_USER
+ FROM system_department dept
+ LEFT JOIN `system_department_user` sdu ON sdu.DEPARTMENT_ID = dept.ID AND sdu.DELETED = 0
+ LEFT JOIN `system_user` usr ON usr.ID = sdu.USER_ID AND usr.DELETED = 0
+ LEFT JOIN `system_user` create_user ON create_user.ID = dept.CREATE_USER
+ LEFT JOIN `system_user` update_user ON update_user.ID = dept.UPDATE_USER
<where>
dept.DELETED = 0
<if test="id != null">
--
Gitblit v1.9.3