From 6ab21f96631f51834f09186195833ea739510cfa Mon Sep 17 00:00:00 2001
From: maLix <mlx950324@163.com>
Date: Fri, 16 Jun 2023 00:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/common/tag/simpleDictSelect.tag.html | 14 +++++++++++++-
 web/src/main/resources/sql/jlw/handsOn.md          |  2 +-
 .../resources/templates/jlw/handsOn/index.html     | 11 +++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html b/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
index 9282af64..cf9f9953 100644
--- a/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
+++ b/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
@@ -4,6 +4,7 @@
 					 name="orgType" value="${user.orgId}" />
 
  forceClear：强制删除缓存 用法：forceClear = true
+ initArray：默认数据
 */
 -->
 <div class="${style!'layui-input-inline'}">
@@ -35,6 +36,18 @@ if(has(readonly)){
     ${isNotEmpty(laySearch)?'lay-search':''}
     >
 	<option  value="">全部</option>
+
+    <!--#
+    var initArrayVar = isNotEmpty(initArray) ? strutil.split(initArray, ' ') : [];
+    var expected = value!"";
+    for(initVal in initArrayVar){
+    var splitVal = strutil.split(initVal, ',');
+    -->
+
+    <option value="${splitVal[0]}" >${splitVal[1]}</option>
+
+    <!--#}-->
+
 	<!--# 
 		var dicts = [];
 		var forceClearVar = isNotEmpty(forceClear) && @java.lang.Boolean.parseBoolean(forceClear);
@@ -44,7 +57,6 @@ if(has(readonly)){
 			//级联选择
 			dicts = dict.dictListByValue(group,value);
 		}
-		var expected = value!"";
 		for(dict in dicts){
 	 -->
 	 
diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md
index 57a8dd3f..311b0402 100644
--- a/web/src/main/resources/sql/jlw/handsOn.md
+++ b/web/src/main/resources/sql/jlw/handsOn.md
@@ -67,7 +67,7 @@ queryByConditionMergeOpenCourseHandsOn
   t.`hands_on_name`,
   t.`add_time`,
   t.`org_id`,
-  za.`name` AS org_id_text ,
+  case when t.`org_id` = 1 then '超级管理员' else za.`name` end AS org_id_text ,
   t.`user_id`,
   t.course_info_id as system_course_info_id,
   (select course_info_name from course_info zc where zc.course_info_id = t.course_info_id and zc.course_info_status = 1 limit 1) as system_course_info_id_text,
diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html
index 95e32ef0..dc52a0db 100644
--- a/web/src/main/resources/templates/jlw/handsOn/index.html
+++ b/web/src/main/resources/templates/jlw/handsOn/index.html
@@ -40,6 +40,17 @@
                                     id="courseChildNode" name="courseChildNode" layFilter="select_courseInfoIds_"/>
         </div>
     </div>
+
+<!--
+这里是demo  新增加initArray
+<div class="layui-inline">
+       <label class="layui-form-label">来源：</label>
+       <div class="layui-input-block">
+           <layui:simpleDictSelect style='layui-input-inline' laySearch="lay-search"
+                                   type="course_info.course_info_name.course_info_status=1,course_info_type=2"
+                                   id="courseChildNode" name="courseChildNode" layFilter="select_courseInfoIds_" initArray="1,超级管理员"/>
+       </div>
+   </div> -->
     <div class="layui-inline">
         <label class="layui-form-label">案例名称：</label>
         <div class="layui-input-block">