getSchoolList 使用有冲突，新改 getCampusSchoolList

back-ui/src/api/dz/cards.js

@@ -161,9 +161,9 @@ export function getSchoolList(query) {
 }
 
 // 获取校区列表
-export function getCampusList(query) {
+export function getCampusSchoolList(query) {
   return request({
-    url: "/dz/school/getCampusList",
+    url: "/dz/school/getCampusSchoolList",
     method: "get",
     params: query,
   });

back-ui/src/views/dz/cards/components/ApplyCardDialog.vue

@@ -74,7 +74,7 @@
 import { ref, computed, watch } from "vue";
 import { requestOpenCard } from "@/api/dz/cards";
 import { listUniversity } from "@/api/dz/school";
-import { associateCampus, getCampusList } from "@/api/dz/cards";
+import { associateCampus, getCampusSchoolList } from "@/api/dz/cards";
 
 const props = defineProps({
   modelValue: {
@@ -116,7 +116,7 @@ const rules = {
 // 获取校区列表
 async function getCampusListData() {
   try {
-    const response = await getCampusList({ pageNum: 1, pageSize: 1000 });
+    const response = await getCampusSchoolList({ campus: true, pageNum: 1, pageSize: 1000 });
     if (response.code === 200) {
       campusList.value = response.data || [];
     }

back-ui/src/views/dz/cards/components/AssignCardDialog.vue

@@ -143,7 +143,7 @@ import {
   assignCard,
   getExamTypes,
   getAgentList,
-  getSchoolList,
+  getCampusSchoolList,
 } from "@/api/dz/cards";
 import { getPaperProvinces } from "@/api/dz/papers";
 
@@ -265,7 +265,8 @@ async function getSchoolListByProvince(province) {
       return;
     }
 
-    const response = await getSchoolList({
+    const response = await getCampusSchoolList({
+      campus: false,
       location: province,
       pageNum: 1,
       pageSize: 9999,

back-ui/src/views/dz/cards/components/AssociateCampusDialog.vue

@@ -72,7 +72,7 @@
 
 <script setup>
 import { ref, computed, watch } from "vue";
-import { associateCampus, getCampusList } from "@/api/dz/cards";
+import { associateCampus, getCampusSchoolList } from "@/api/dz/cards";
 
 const props = defineProps({
   modelValue: {
@@ -113,7 +113,8 @@ const rules = {
 // 获取校区列表
 async function getCampusListData() {
   try {
-    const response = await getCampusList({
+    const response = await getCampusSchoolList({
+      campus: true,
       pageNum: 1,
       pageSize: 9999, // 获取所有校区
     });

back-ui/src/views/dz/cards/index.vue

@@ -286,7 +286,7 @@ import ApplyCardDialog from "./components/ApplyCardDialog.vue";
 import formInfo from "./config/form.js";
 import tableConfig from "./config/table.js";
 import { listUniversity } from "@/api/dz/school";
-import { assignCard, issueCard, getCampusList } from "@/api/dz/cards";
+import { assignCard, issueCard, getCampusSchoolList } from "@/api/dz/cards";
 import { listDept } from "@/api/system/dept";
 import { listAgent } from "@/api/dz/agent";
 
@@ -584,7 +584,8 @@ function getSchoolList() {
 
 /** 获取校区列表 */
 function getCampusListData() {
-  getCampusList({
+  getCampusSchoolList({
+    campus: true,
     pageNum: 1,
     pageSize: 9999, // 获取所有校区
   })

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzSchoolController.java

@@ -94,12 +94,9 @@ public class DzSchoolController extends BaseController
         return getDataTable(list);
     }
 
-    @GetMapping("/getCampusList")
-    public AjaxResult getCampusList(DzSchool dzSchool)
+    @GetMapping("/getCampusSchoolList")
+    public AjaxResult getCampusSchoolList(DzSchool dzSchool)
     {
-        if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
-            dzSchool.setCampus(true);
-        }
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
         return AjaxResult.success(list);
     }