'commit'

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -1853,7 +1853,6 @@ public class CollectController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-
     /**
      * 功能: 任务发布者，查看发布的任务填充情况(人员)
      *

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -2500,21 +2500,9 @@ public class CollectModel {
         }
         kv.set("stage_id", stage_id);
         kv.set("entry_year", entry_year);
-        kv.set("keyword", keyword);
+        if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         SqlPara sqlPara = Db.getSqlPara("Collect.getClassList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
     }
-
-    /**
-     * 功能：获取人员任务访问列表
-     *
-     * @param keyword
-     * @param is_finish
-     * @param page
-     * @param limit
-     */
-    public void viewJobListForPerson(String keyword, int is_finish, int page, int limit) {
-
-    }
 }

src/main/resource/Sql/Collect.sql

@@ -189,6 +189,9 @@
     -- 获取当前登录人员所在单位下的+所在年级下所有班级
     #sql("getClassList")
         select * from t_base_class as t1 where t1.bureau_id=#para(bureau_id) and t1.entry_year=#para(entry_year) and t1.stage_id=#para(stage_id)
-        and class_name like #para(keyword, "like")
+        #if(keyword)
+            and class_name like #para(keyword, "like")
+        #end
+        order by t1.stage_id,t1.class_num
     #end
 #end