From 1b4592400343f49510489c984b98b448667a5031 Mon Sep 17 00:00:00 2001 From: wanghu Date: Tue, 8 Sep 2026 17:30:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC[]{}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/oapi/oa/DbClassController.java | 8 ++------ .../controller/oapi/oa/TeainfoController.java | 10 +++++----- .../controller/oapi/oa/UserInfoController.java | 11 +++++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/DbClassController.java b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/DbClassController.java index d4f82b5..6287e92 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/DbClassController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/DbClassController.java @@ -20,11 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; /** Compatibility endpoints used by BestSchool.IBaseClass.BLL.DbClass consumers. */ @@ -43,7 +39,7 @@ public class DbClassController { public ResponseEntity>> getSchteaList( @Parameter(description = "School ID", required = true, example = "3") @RequestParam("Group") Integer group) { - if (group == null || group <= 0) return ResponseEntity.badRequest().build(); + if (group == null || group <= 0) return ResponseEntity.ok(new ArrayList<>()); SchInfoVO school = schInfoService.GetSchFirst(group); String schSerId = school == null diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/TeainfoController.java b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/TeainfoController.java index ef9dff7..8f20419 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/TeainfoController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/TeainfoController.java @@ -52,7 +52,7 @@ public class TeainfoController { public ResponseEntity getTeainfo(@RequestParam Integer uid) { // 1. 鍙傛暟鏍￠獙 if (uid == null) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new TeaInfoVO()); } // 2. 鐩存帴浣跨敤 uid 鏌ヨ @@ -63,7 +63,7 @@ public class TeainfoController { }) .map(this::convertToTeaInfoVO) .map(ResponseEntity::ok) - .orElse(ResponseEntity.notFound().build()); + .orElse(ResponseEntity.ok(new TeaInfoVO())); } private TeaInfoVO convertToTeaInfoVO(SchTeacher teacher) { @@ -134,7 +134,7 @@ public class TeainfoController { public ResponseEntity> getArrTeainfo(@RequestBody String userIds) { // 1. 鍙傛暟鏍￠獙 if (userIds == null) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new ArrayList<>()); } List uids= Arrays.asList(OtherUtil.convertToArray(userIds)); @@ -146,7 +146,7 @@ public class TeainfoController { .filter(Objects::nonNull) .collect(Collectors.toList()); - return voList.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(voList); + return ResponseEntity.ok(voList); } /** @@ -174,7 +174,7 @@ public class TeainfoController { // 1. 参数校验：SchSerID 与 schId 至少传一个 Integer resolvedSchId = resolveSchId(schId, SchSerID); if (resolvedSchId == null) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new ArrayList<>()); } List teachers = schTeacherService.getSchTeacherList(resolvedSchId); diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/UserInfoController.java b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/UserInfoController.java index 6c8b4b9..31c97e5 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/UserInfoController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/oapi/oa/UserInfoController.java @@ -52,12 +52,12 @@ public class UserInfoController { public ResponseEntity> getUserList(@RequestParam String SchSerID) { // 1. 鍙傛暟鏍￠獙 if (SchSerID == null || SchSerID.trim().isEmpty()) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new ArrayList<>()); } SchInfoVO schInfoVO = schInfoService.GetSchFirst(SchSerID); if (schInfoVO == null) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new ArrayList<>()); } Integer schId = schInfoVO.getUserSchSerId(); @@ -81,7 +81,7 @@ public class UserInfoController { } // 4. 杩斿洖缁撴灉 - return voList.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(voList); + return ResponseEntity.ok(voList); } // ===== 杞崲鏁欏笀 ===== @@ -157,7 +157,7 @@ public class UserInfoController { @Operation(summary = "getUserIdList") public ResponseEntity> getUserIdList(@RequestParam Integer userid) { if (userid == null) { - return ResponseEntity.badRequest().build(); + return ResponseEntity.ok(new ArrayList<>()); } Optional teacherOpt = schTeacherRepository.findByTeaId(userid); @@ -175,8 +175,7 @@ public class UserInfoController { return ResponseEntity.ok(Collections.singletonList(vo)); } } - - return ResponseEntity.notFound().build(); + return ResponseEntity.ok(new ArrayList<>()); }