Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

dsBaseWeb/ds-base/html/pages/ylt/knowledge/index.html

@@ -144,7 +144,7 @@
                                 } else {
                                     layer.msg(result.msg, {
                                         icon: 2,
-                                        time: 1000
+                                        time: 2000
                                     });
                                 }
                             }

dsRes/src/main/resources/Sql/base.sql

@@ -2,13 +2,16 @@
 #namespace("Base")
 
   #sql("listScheme")
-     select * from t_resource_scheme where b_use=1
+     select t1.*,t2.subject_name,t3.stage_name from t_resource_scheme as t1
+              inner join t_dm_subject as t2 on t1.subject_id=t2.subject_id
+              inner join t_dm_stage as t3 on t1.stage_id=t3.stage_id
+         where t1.b_use=1
          #if(stage_id)
-            and stage_id=#para(stage_id)
+            and t1.stage_id=#para(stage_id)
          #end
          #if(subject_id)
-            and subject_id=#para(subject_id)
+            and t1.subject_id=#para(subject_id)
          #end
-         order by stage_id,sort_id
+         order by t1.stage_id,t1.sort_id
   #end
 #end