Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/benyi/thememonthplan/table.vue

@@ -188,27 +188,31 @@ export default {
     getList() {
       //console.log(this.queryParams.wpid);
       listMonthplanitem(this.queryParams).then((response) => {
-        this.bodyData.monthplanitemList = response.rows;
-
-        //获取所有的活动id
-        var activityIds = "";
-        response.rows.forEach(function (value, key, arr) {
-          if (value.activityid != null) {
-            activityIds = activityIds + value.activityid + ";";
-          }
-        });
-        var array = [];
-        activityIds.split(";").forEach(function (value, key, arr) {
-          if (value != "") {
-            array.push(parseInt(value));
-          }
-        });
-
         if (response.rows.length > 0) {
-          this.getThemeActivityList(array);
+          this.bodyData.monthplanitemList = response.rows;
-        }
 
-        this.bodyData.monthplanitemList[0].theme = activityIds;
+          //获取所有的活动id
+          var activityIds = "";
+          response.rows.forEach(function (value, key, arr) {
+            if (value.activityid != null) {
+              activityIds = activityIds + value.activityid + ";";
+            }
+          });
+          var array = [];
+          activityIds.split(";").forEach(function (value, key, arr) {
+            if (value != "") {
+              array.push(parseInt(value));
+            }
+          });
+
+          if (response.rows.length > 0) {
+            this.getThemeActivityList(array);
+          }
+
+          this.bodyData.monthplanitemList[0].theme = activityIds;
+        }else{
+          this.bodyData.monthplanitemList[0].theme = " ";
+        }
       });
     },
     // 主题--字典状态字典翻译

ruoyi-ui/src/views/benyi/themetermplan/table.vue

@@ -108,7 +108,7 @@ export default {
     },
     // 主题--字典状态字典翻译
     themeFormat(themeids) {
-      if (themeids != "") {
+      if (themeids != "" && themeids != null) {
         var ilength = themeids.split(";").length - 1;
         var names = "";
         for (var i = 1; i < ilength; i++) {

ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml

@@ -40,7 +40,7 @@
             <if test="createuserid != null ">and createuserid = #{createuserid}</if>
             <if test="xnxq != null  and xnxq != ''">and xnxq = #{xnxq}</if>
         </where>
-        order by month desc
+        order by month,zc desc
     </select>
 
     <select id="selectByThemeWeekplanById" parameterType="String" resultMap="ByThemeWeekplanResult">