ios日期不显示 周计划审核不显示主题 直接跳转到课程树折叠

ruoyi-ui/src/utils/ruoyi.js

@@ -18,7 +18,7 @@ export function parseTime(time, pattern) {
 		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
 			time = parseInt(time)
 		} else if (typeof time === 'string') {
-			time = time.replace(new RegExp(/-/gm), '/');
+			time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
 		}
 		if ((typeof time === 'number') && (time.toString().length === 10)) {
 			time = time * 1000

ruoyi-ui/src/views/benyi/themestudy_tremplan/index.vue

@@ -19,7 +19,7 @@
             :expand-on-click-node="true"
             :filter-node-method="filterNode"
             ref="tree"
-            default-expand-all
+            :default-expand-all="false"
             @node-click="handleNodeClick"
           />
         </div>

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java

@@ -63,12 +63,19 @@ public class ByThemeMonthplanController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) {
         byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-        String classId = schoolCommon.getClassId();
+        //参数传进来的班级编号
+        String strClassId = byThemeMonthplan.getClassid();
         List<ByThemeMonthplan> list = null;
+        //如果传进来的班级编号为空，那么就认为是本身查询
+        if (schoolCommon.isStringEmpty(strClassId)) {
+            String classId = schoolCommon.getClassId();
             //首先判断当前账户是否为幼儿园账号
             if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
                 byThemeMonthplan.setClassid(classId);
             }
+        }else{
+            byThemeMonthplan.setClassid(strClassId);
+        }
         startPage();
         list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
         return getDataTable(list);