From 45dce526365b4473d1f6c1e83c705db2674c115f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 14:56:31 +0800
Subject: [PATCH] 议事回显问题

---
 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml                 |    9 ++++++++-
 src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java |    7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
index 03a632b..b09680d 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -105,7 +105,14 @@
         jt.option_number,
         jt.mandatory_flag,
         jt.attachment,
-        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
+        (	SELECT
+        jut.selected
+        FROM
+        jczz_user_topics jut
+        LEFT JOIN jczz_topics jts ON jts.id = jut.topics_id
+        WHERE
+        jut.article_id = jt.article_id
+        AND jts.parent_id = jt.id  AND jut.user_id = #{userId}
         limit 1
         ) selected
         FROM
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index 8bbcb15..fcf8e67 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -107,6 +107,7 @@
 	@Nullable
 	private Boolean getaBoolean(List<TopicsVO> topics) {
 		List<UserTopicsEntity> objects = new ArrayList<>();
+		Boolean result = false;
 		for (TopicsVO topic : topics) {
 			UserTopicsEntity userTopicsEntity = new UserTopicsEntity();
 			userTopicsEntity.setUserId(AuthUtil.getUserId());
@@ -131,7 +132,7 @@
 				objectUpdateWrapper.setSql("number = number + 1");
 				objectUpdateWrapper.eq("id", topic.getSelected());
 				topicsService.update(null, objectUpdateWrapper);
-				return save(userTopics);
+				result = save(userTopics);
 			} else {
 				// 多选
 				if (StringUtils.isBlank(topic.getSelected())) {
@@ -154,10 +155,10 @@
 					objectUpdateWrapper.eq("id", o);
 					topicsService.update(null, objectUpdateWrapper);
 				}
-				return saveBatch(objectsTwo);
+				result = saveBatch(objectsTwo);
 			}
 		}
-		return false;
+		return result;
 	}
 
 

--
Gitblit v1.9.3