From 5e294546fecfe1f36a684c2ea6ea81bd61fe6810 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sun, 15 Aug 2021 10:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=95=B4=E5=90=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/benyi/themestudy/index.vue | 34 +++++++++++++++----
 .../mybatis/benyi/ByThemeActivityMapper.xml   |  1 +
 .../resources/mybatis/benyi/ByThemeMapper.xml |  6 ++--
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/themestudy/index.vue b/ruoyi-ui/src/views/benyi/themestudy/index.vue
index f4e9d1340..78d306947 100644
--- a/ruoyi-ui/src/views/benyi/themestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/themestudy/index.vue
@@ -78,7 +78,7 @@
 
 <script>
 import { treeselect, getTheme } from "@/api/benyi/theme";
-import { listActivity } from "@/api/benyi/activity";
+import { listActivity, getActivity } from "@/api/benyi/activity";
 import Editor from "@/components/Editor";
 
 export default {
@@ -119,6 +119,7 @@ export default {
       },
       // 查询参数
       queryParams: {
+        id: undefined,
         themeid: undefined,
       },
     };
@@ -181,18 +182,24 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.id = data.id;
-      console.log(data.id);
-      if (data.id >= 9999) {
-      } else {
+      //console.log(data.id);
+      if (data.id >= 9999 && data.id < 99999) {
+      } else if (data.id >= 99999) {
+        //console.log("2jiedian");
+        this.id = this.id - 99999;
         this.title = data.label;
         this.getThemeDetails();
+      } else {
+        this.title = data.label;
+        this.getThemeDetail();
+        //console.log("最后节点");
       }
       // console.log(this.dayflowtaskList[date.id])
       // this.getStandardList();
     },
     getThemeDetails() {
       getTheme(this.id).then((response) => {
-        console.log(response);
+        //console.log(response);
         if (response.code == "200") {
           this.title1 = "主题网络";
           this.title2 = "家园沟通";
@@ -200,9 +207,10 @@ export default {
           this.note = response.data.content;
           this.communicate = response.data.communicate;
           this.queryParams.themeid = response.data.id;
+          this.queryParams.id = "";
 
           listActivity(this.queryParams).then((req) => {
-            console.log(req);
+            //console.log(req);
             if (req.code == "200") {
               this.activityList = req.rows;
             }
@@ -210,6 +218,20 @@ export default {
         }
       });
     },
+    getThemeDetail() {
+      this.title1 = "";
+      this.title2 = "";
+      this.title3 = "活动方案";
+      this.queryParams.id = this.id;
+      this.queryParams.themeid = "";
+      //console.log(this.id);
+      listActivity(this.queryParams).then((req) => {
+        //console.log(req);
+        if (req.code == "200") {
+          this.activityList = req.rows;
+        }
+      });
+    },
   },
 };
 </script>
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeActivityMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeActivityMapper.xml
index 9a64b47f2..a832750e3 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeActivityMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeActivityMapper.xml
@@ -27,6 +27,7 @@
     <select id="selectByThemeActivityList" parameterType="ByThemeActivity" resultMap="ByThemeActivityResult">
         <include refid="selectByThemeActivityVo"/>
         <where>
+            <if test="id != null ">and id = #{id}</if>
             <if test="themeid != null ">and themeid = #{themeid}</if>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="type != null  and type != ''">and type = #{type}</if>
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml
index cdd6f196f..cf86803e8 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByThemeMapper.xml
@@ -22,8 +22,10 @@
     <sql id="selectByThemeVoTree">
         select dict_value+9999 id, 0 parent_id,dict_label name,dict_sort sort   from sys_dict_data where dict_type='sys_yebjlx' and dict_label !='托班（2-3岁）'
         union all
-        select id, classid+9999, name, sort from by_theme
-        order by sort
+        select id+99999, classid+9999, name, sort from by_theme
+        union all
+		select id,themeid+99999,name,sort from by_theme_activity
+		order by sort
     </sql>
 
     <select id="selectByThemeListTree" parameterType="ByTheme" resultMap="ByThemeResult">