Commit 836c91e70b0cdbbbf85afa234869d36d79d13618
1 parent
91a655aaaa
Exists in
dev
更新回复代码
Showing 2 changed files with 13 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java
View file @
836c91e
| ... | ... | @@ -411,7 +411,7 @@ |
| 411 | 411 | @RequestMapping(method = RequestMethod.POST, value = "/reviewAdd") |
| 412 | 412 | @ResponseBody |
| 413 | 413 | public BaseResponse reviewAdd(@RequestBody ReviewModel reviewModel, HttpServletRequest request) { |
| 414 | - return courseFacade.reviewAdd(reviewModel,getUserId(request)); | |
| 414 | + return courseFacade.reviewAdd(reviewModel); | |
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | /* |
| ... | ... | @@ -420,7 +420,7 @@ |
| 420 | 420 | @RequestMapping(method = RequestMethod.POST, value = "/reviewAddContent") |
| 421 | 421 | @ResponseBody |
| 422 | 422 | public BaseResponse reviewAddContent(@RequestBody ReviewModel reviewModel, HttpServletRequest request) { |
| 423 | - return courseFacade.reviewAddContent(reviewModel,getUserId(request)); | |
| 423 | + return courseFacade.reviewAddContent(reviewModel); | |
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | /* |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
View file @
836c91e
| ... | ... | @@ -1307,24 +1307,21 @@ |
| 1307 | 1307 | return objectResponse; |
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | - public BaseResponse reviewAdd(ReviewModel reviewModel, Integer userId) { | |
| 1310 | + public BaseResponse reviewAdd(ReviewModel reviewModel) { | |
| 1311 | 1311 | BaseResponse objectResponse = new BaseResponse(); |
| 1312 | 1312 | Date day=new Date(); |
| 1313 | 1313 | SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 1314 | 1314 | String format = df.format(day); |
| 1315 | 1315 | reviewModel.setCreateDate(format); |
| 1316 | 1316 | reviewModel.setYn(YnEnums.YES.getId()); |
| 1317 | - //操作人为当前用户id | |
| 1318 | - reviewModel.setReviewId(userId.toString()); | |
| 1319 | 1317 | |
| 1320 | - | |
| 1321 | 1318 | courseEvalService.reviewAdd(reviewModel); |
| 1322 | 1319 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 1323 | 1320 | objectResponse.setErrormsg("成功"); |
| 1324 | 1321 | return objectResponse; |
| 1325 | 1322 | } |
| 1326 | 1323 | |
| 1327 | - public BaseResponse reviewAddContent(ReviewModel reviewModel, Integer userId) { | |
| 1324 | + public BaseResponse reviewAddContent(ReviewModel reviewModel) { | |
| 1328 | 1325 | BaseResponse objectResponse = new BaseResponse(); |
| 1329 | 1326 | Date day=new Date(); |
| 1330 | 1327 | SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| ... | ... | @@ -1332,7 +1329,6 @@ |
| 1332 | 1329 | reviewModel.setCreateDate(format); |
| 1333 | 1330 | reviewModel.setYn(YnEnums.YES.getId()); |
| 1334 | 1331 | //操作人为当前用户id |
| 1335 | - reviewModel.setReviewId(userId.toString()); | |
| 1336 | 1332 | reviewModel.setParentId(reviewModel.getParentId()); |
| 1337 | 1333 | |
| 1338 | 1334 | |
| ... | ... | @@ -1357,13 +1353,15 @@ |
| 1357 | 1353 | |
| 1358 | 1354 | List<ReviewModel> matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合 |
| 1359 | 1355 | |
| 1360 | - if (!models.isEmpty()) { | |
| 1361 | - matchingModels.add(models.get(0)); // 将models集合中的第一条数据添加到匹配集合中 | |
| 1362 | - } | |
| 1363 | - | |
| 1364 | - if (!models1.isEmpty()) { | |
| 1365 | - int index = models1.size() > 1 ? 1 : 0; // 如果models1集合中有多个数据，则获取第二条数据，否则获取第一条数据 | |
| 1366 | - matchingModels.add(models1.get(index)); // 将models1集合中的数据添加到匹配集合中 | |
| 1356 | + for (ReviewModel model : models) { | |
| 1357 | + String ids = model.getId(); // 获取models中的ID | |
| 1358 | + for (ReviewModel model1 : models1) { | |
| 1359 | + if (model1.getParentId() == ids) { // 在models1中查找匹配的parentId | |
| 1360 | + matchingModels.add(model); // 将对应的models数据添加到匹配集合中 | |
| 1361 | + matchingModels.add(model1); // 将对应的models1数据添加到匹配集合中 | |
| 1362 | + break; // 找到匹配数据后跳出内层循环 | |
| 1363 | + } | |
| 1364 | + } | |
| 1367 | 1365 | } |
| 1368 | 1366 | |
| 1369 | 1367 |