From 98661dae111965b72b758a14d687b3218c2e2089 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 15:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index ba9e77f..c9c6a2e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -93,7 +93,9 @@
update.setEditor(loginUserInfo.getId());
update.setEditDate(new Date());
update.setTitle(problems.getTitle());
- update.setOptions(problems.getOptions());
+ if(null != problems.getObjectList() && problems.getObjectList().size() > 0) {
+ update.setOptions(JSON.toJSONString(problems.getObjectList()));
+ }
update.setAnswer(problems.getAnswer());
update.setSortnu(problems.getSortnu());
update.setType(problems.getType());
@@ -174,7 +176,7 @@
queryWrapper.lambda().eq(Problems::getSortnu, pageWrap.getModel().getSortnu());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Problems::getType, pageWrap.getModel().getType());
+ queryWrapper.lambda().in(Problems::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getScore() != null) {
queryWrapper.lambda().eq(Problems::getScore, pageWrap.getModel().getScore());
--
Gitblit v1.9.3