wangliang 11 月之前
父節點
當前提交
3603d8fe9e

+ 12 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -920,7 +920,18 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     tbUser.setPassword(SystemConstant.DEFAULT_PASSWORD);
                 }
             }
-            tbUserList.add(tbUser);
+            if (!CollectionUtils.isEmpty(tbUserList)) {
+                TBUser finalTbUser = tbUser;
+                List<TBUser> tbUserRepeatList = tbUserList.stream().filter(s -> s.equals(finalTbUser))
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(tbUserRepeatList)) {
+                    tbUser.setId(tbUserRepeatList.get(0).getId());
+                } else {
+                    tbUserList.add(tbUser);
+                }
+            } else {
+                tbUserList.add(tbUser);
+            }
 
             QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
             tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, orgId)

+ 1 - 1
themis-business/src/main/resources/mapper/TBExamInvigilateUserMapper.xml

@@ -8,7 +8,7 @@
         tbeiu.room_name as roomName,
         tee.id as examId,
         tee.name as examName,
-        GROUP_CONCAT(tbu.name) as name
+        GROUP_CONCAT(tbu.name order by tbu.name) as name
         from
         t_b_exam_invigilate_user tbeiu
         join t_e_exam tee on