From c2cd507da74f1841d0133d4c9bff9025ce1066ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 10:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/main/resources/mapper/SubjectMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/SubjectMapper.xml b/src/main/resources/mapper/SubjectMapper.xml
index b5bfd26..e7d4ac5 100644
--- a/src/main/resources/mapper/SubjectMapper.xml
+++ b/src/main/resources/mapper/SubjectMapper.xml
@@ -116,7 +116,7 @@
<select id="allSubject" resultMap="BaseResultMap">
select
- ts.id, ts.name
+ DISTINCT ts.id, ts.name
from t_subject ts
<if test="admin == false and deptIds != null and deptIds.size > 0">
INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id
--
Gitblit v1.8.0