mingfu 1 месяц назад
Родитель
Сommit
9cd6a93f99

+ 3 - 3
ie-admin/src/main/java/com/ruoyi/web/controller/ie/VoluntaryController.java

@@ -69,8 +69,7 @@ public class VoluntaryController extends BaseController {
     @PostMapping("/voluntary/postRenderRules")
     @ApiOperation("单院校专业结果")
     public R<VoluntaryDto.RenderMajorResult> postRenderRules(@RequestBody String data) {
-        // commService.requireVip();
-
+        commService.requireVip();
         VoluntaryDto.SingleRequest req = new VoluntaryDto.SingleRequest();
         JSONObject root = JSONObject.parseObject(data);
         Map<String, String> form = req.getForm();
@@ -88,7 +87,7 @@ public class VoluntaryController extends BaseController {
     @PostMapping("/voluntary/postSkillRules")
     @ApiOperation("单院校专业结果")
     public R<VoluntaryDto.RenderMajorResult> postSkillRules(@RequestBody String data) {
-        // commService.requireVip();
+        commService.requireVip();
         VoluntaryDto.SingleRequest req = new VoluntaryDto.SingleRequest();
         JSONObject root = JSONObject.parseObject(data);
         Map<String, String> form = req.getForm();
@@ -113,6 +112,7 @@ public class VoluntaryController extends BaseController {
     @PostMapping("voluntary/addVoluntary")
     @ApiOperation("填报志愿")
     public R<Long> addVoluntary(@RequestBody String body) { // 填报 // 前端+后台按需要剔除一些不需快照的信息(目前主要是院校信息)
+        commService.requireVip();
         JSONObject model = JSONObject.parseObject(body);
         return voluntaryService.addVoluntary2(model);
     }

+ 1 - 1
ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

@@ -1665,7 +1665,7 @@ public class VoluntaryService {
     }
     private AWishRecord getWishRecord(Long userId) {
         AWishRecord wrCond = new AWishRecord();
-        wrCond.setId(userId);
+        wrCond.setUserId(userId);
         wrCond.setStatus(1);
         List<AWishRecord> wishList = aWishRecordMapper.selectAWishRecordList(wrCond);
         return wishList.isEmpty() ? new AWishRecord() : wishList.get(0);