Crazy 4 mesiacov pred
rodič
commit
ffe1331704

+ 4 - 3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -329,7 +329,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
             "HAVING COUNT(sa.id) > 2;")
     List<AdminUserDO> getStudentErrorAttendance();
 
-    @Select("SELECT COUNT(*) FROM system_users WHERE grade =#{grade} AND supervisor_id = #{supervisorId} AND (external_supervisor_id IS NULL OR external_supervisor_id != 0)  AND master_type = #{masterType} AND user_type = '1' AND deleted = 0")
+
+    @Select("SELECT COUNT(*) FROM system_users WHERE grade =#{grade} AND supervisor_id = #{supervisorId} AND (external_supervisor_id IS NULL OR external_supervisor_id == 0)  AND master_type = #{masterType} AND user_type = '1' AND deleted = 0")
     Integer countStudentListBySupervisorId(@Param("grade") String grade,@Param("supervisorId") Long supervisorId, @Param("masterType") Integer masterType);
 
     @Select("SELECT COUNT(*) FROM system_users WHERE grade =#{grade} AND external_supervisor_id = #{externalSupervisorId} AND master_type = #{masterType} AND user_type = '1' AND deleted = 0")
@@ -356,9 +357,9 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     //初始化当年级下的校生的导师id
     @Update("UPDATE system_users " +
             "SET supervisor_id = NULL, external_supervisor_id = NULL " +
-            "WHERE supervisor_id IS NOT NULL AND supervisor_id != 0 " +
+            "WHERE ((supervisor_id IS NOT NULL AND supervisor_id != 0) OR (external_supervisor_id IS NOT NULL AND external_supervisor_id != 0)) " + // 确保 OR 的条件优先
             "AND grade = #{grade} " +
-            "AND user_type = '1' " +//在校生
+            "AND user_type = '1' " + // 在校生
             "AND deleted = 0")
     void updateStudentSupervisorId(@Param("grade") String grade);