卡关联校区

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

@@ -103,7 +103,7 @@
         <el-button
           type="primary"
           plain
-          :disabled="multiple"
+
           @click="handleAssociateCampus"
           v-hasPermi="['dz:cards:add']"
           style="border-color: #1890ff; color: #1890ff; font-weight: 500"
@@ -116,7 +116,6 @@
         <el-button
           type="success"
           plain
-          :disabled="multiple"
           @click="handleApplyCard"
           v-hasPermi="['dz:cards:add']"
           style="border-color: #52c41a; color: #52c41a; font-weight: 500"
@@ -805,8 +804,8 @@ function handleRefundConfirm(cardNo) {
 /** 关联校区按钮操作 */
 function handleAssociateCampus() {
   if (selectedRows.value.length === 0) {
-    proxy.$modal.msgWarning("请选择要关联校区的卡片");
-    return;
+    // proxy.$modal.msgWarning("请选择要关联校区的卡片");
+    // return;
   }
   associateCampusOpen.value = true;
 }
@@ -841,8 +840,8 @@ async function getAgentListData() {
 /** 申请开卡按钮操作 */
 function handleApplyCard() {
   if (selectedRows.value.length === 0) {
-    proxy.$modal.msgWarning("请选择要申请开卡的卡片");
-    return;
+    // proxy.$modal.msgWarning("请选择要申请开卡的卡片");
+    // return;
   }
   applyCardOpen.value = true;
 }

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontUniversitiesController.java

@@ -141,7 +141,7 @@ public class FrontUniversitiesController extends BaseController {
         startPage();
         List<BBusiWishUniversities> arr;
         Integer planYear = voluntaryService.getPlanYear(user);
-        if(Constant.EXAM_TYPE_ZG.equals(user.getExamType())) {
+        if(Constant.EXAM_TYPE_ZG.equals(user.getExamType().title())) {
             //职高对口
             arr = universitiesService.selectMajorWishUniversitiesListSimpleByMap2(cond.toCondMap(planYear, user.getExamType().title(), user.getSelectSubject(), user.getLocation())); // TODO MF
         } else {
@@ -174,7 +174,7 @@ public class FrontUniversitiesController extends BaseController {
         data.getBaseInfo().setCollected(CollectionUtils.isNotEmpty(list));
         this.saveUniversitiesClicks(code);
 
-        if(Constant.EXAM_TYPE_ZG.equals(sysUser.getExamType())) {
+        if(Constant.EXAM_TYPE_ZG.equals(sysUser.getExamType().title())) {
             Integer examMajor = sysUser.getSelectSubject(); // TODO MF
 
             BBusiWishUniversitySubmitRecruitPlan planCond = new BBusiWishUniversitySubmitRecruitPlan();
@@ -190,7 +190,7 @@ public class FrontUniversitiesController extends BaseController {
             submitCond.setLiberalScience(examMajor);
             List<UniversityDetailDTO.WishSubmit> submitList = wishUniversitySubmitMarjorsService.selectBBusiWishUniversitySubmitMarjorsList(submitCond).stream().map(t -> new UniversityDetailDTO.WishSubmit(t)).collect(Collectors.toList());
             data.setEnrollHistories(submitList);
-        } else if(Constant.EXAM_TYPE_PG.equals(sysUser.getExamType()) || Constant.EXAM_TYPE_ZZ.equals(sysUser.getExamType())) {
+        } else if(Constant.EXAM_TYPE_PG.equals(sysUser.getExamType().title()) || Constant.EXAM_TYPE_ZZ.equals(sysUser.getExamType().title())) {
             Pair<List<UniversityDetailDTO.WishPlan>, List<UniversityDetailDTO.WishSubmit>> pair = voluntaryService.getUniversityHistory(universityId, sysUser.getLocation(), sysUser.getExamType().title());
             data.setPlanHistories(pair.getLeft());
             data.setEnrollHistories(pair.getRight());