'commit'

dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java

@@ -175,8 +175,8 @@ public class BaseController extends Controller {
      */
     @Before({GET.class})
     @IsNumericInterface({"pageNum", "pageSize"})
-    public void listScheme(int stage_id, int pageNum, int pageSize) {
-        Page<Record> listPage = bm.listScheme(stage_id, pageNum, pageSize);
+    public void listScheme(int stage_id, int subject_id, int pageNum, int pageSize) {
+        Page<Record> listPage = bm.listScheme(stage_id, subject_id, pageNum, pageSize);
         renderJson(RetKit.renderSuccess(listPage));
     }
 

dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java

@@ -1,8 +1,10 @@
 package com.dsideal.resource.Base.Model;
 
+import com.jfinal.kit.Kv;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.SqlPara;
 
 import java.util.HashMap;
 import java.util.List;
@@ -218,18 +220,16 @@ public class BaseModel {
      * @param pageSize
      * @return
      */
-    public Page<Record> listScheme(int stage_id, int pageNum, int pageSize) {
-        String sql;
-        Page<Record> subjectPage;
-        if (stage_id == 0) {
-            sql = "from t_resource_scheme";
-            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
-        } else {
-            sql = "from t_resource_scheme where stage_id=" + stage_id;
-            subjectPage = Db.paginate(pageNum, pageSize, "select *", sql);
+    public Page<Record> listScheme(int stage_id, int subject_id, int pageNum, int pageSize) {
+        Kv kv = Kv.create();
+        if (stage_id > 0) {
+            kv.set("stage_id", stage_id);
         }
-
-        return subjectPage;
+        if (subject_id > 0) {
+            kv.set("subject_id", subject_id);
+        }
+        SqlPara sqlPara = Db.getSqlPara("Base.listScheme", kv);
+        return Db.paginate(pageNum, pageSize, sqlPara);
     }
 
     /**

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

@@ -0,0 +1,13 @@
+-- 菜单命名空间
+#namespace("Base")
+
+  #sql("listScheme")
+     select * from from t_resource_scheme
+         #if(stage_id)
+            and stage_id=#para(stage_id)
+         #end
+         #if(subject_id)
+            and subject_id=#para(subject_id)
+         #end
+  #end
+#end

dsRes/src/main/resource/Sql/test.sql

@@ -1,21 +0,0 @@
--- 菜单命名空间
-#namespace("menu")
-
-  -- 查询菜单的ids
-  #sql("selectMenuForIds")
-    select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id,
-       (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf
-    from t_base_menu as t1 where t1.menu_id in
-                             (
-                                 #for(x:ids)
-                                     #(for.index == 0 ? "" : ",")  #para(x)
-                #end
-                                 ) order by t1.sort_id
-  #end
-
-    -- 人员根据职务+分管工作可见的菜单
-    #sql("selectMenuByPersonId")
-        select distinct menu_id from t_base_principalship_menu as t1 inner join t_person_duty_charge as t2 on t1.duties_id=t2.`duties_id`
-            and t1.in_charge_id=t2.`in_charge_id` where  t2.person_id=? and t2.b_use=1
-    #end
-#end