'commit'

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

@@ -584,17 +584,13 @@ public class CollectController extends Controller {
      * 功能：获取单位列表
      *
      * @param org_type_id
-     * @param school_type_id
-     * @param city_id
-     * @param area_id
      * @return
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getBureauList(int org_type_id, int school_type_id,
+    public void getBureauList(int org_type_id, String org_name,int page, int limit) {
-                               String city_id, String area_id,
+
-                              int page, int limit) {
+        Page<Record> list = cm.getBureauList(org_type_id,org_name, page, limit);
-        Page<Record> list = cm.getBureauList(org_type_id, school_type_id,  city_id, area_id, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -624,6 +620,7 @@ public class CollectController extends Controller {
 
     /**
      * 功能：获取任务信息
+     *
      * @param job_id
      */
     @Before({GET.class})

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

@@ -2,9 +2,11 @@ package com.dsideal.QingLong.Collect.Model;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.io.FileUtil;
+import com.YunXiao.Model.BaseModel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dsideal.QingLong.Collect.Const.DataTypeConst;
+import com.dsideal.QingLong.Global.Model.GlobalModel;
 import com.dsideal.QingLong.Util.ChineseCharacterUtil;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.PoiUtil;
@@ -716,19 +718,15 @@ public class CollectModel {
      * 功能：获取单位列表
      *
      * @param org_type_id
-     * @param school_type_id
-     * @param city_id
-     * @param area_id
      * @return
      */
-    public Page<Record> getBureauList(int org_type_id, int school_type_id,
+    public Page<Record> getBureauList(int org_type_id, String org_name, int page, int limit) {
-                                      String city_id, String area_id,
-                                      int page, int limit) {
         Kv kv = Kv.create();
         if (org_type_id != -1) kv.set("org_type_id", org_type_id);
-        if (school_type_id != -1) kv.set("school_type_id", school_type_id);
+        GlobalModel gm = new GlobalModel();
-        if (!StrKit.isBlank(city_id)) kv.set("city_id", city_id);
+        String city_id = gm.getGlobalValueByKey("install_area");
-        if (!StrKit.isBlank(area_id)) kv.set("area_id", area_id);
+        kv.set("city_id", city_id);
+        if (!StrKit.isBlank(org_name)) kv.set("org_name", org_name);
         SqlPara sqlPara = Db.getSqlPara("Collect.getBureauList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
@@ -748,19 +746,19 @@ public class CollectModel {
                            int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds) throws ParseException {
         Set<String> bureauSet = new HashSet<>();
         if (shiZhiSchool == 1) {
-            Page<Record> list = getBureauList(9, -1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(9, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (shiZhiJiaoFu == 1) {
-            Page<Record> list = getBureauList(5, -1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(5, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (quXiaoJiaoYuJu == 1) {
-            Page<Record> list = getBureauList(4, -1, null, null, 1, 9999);
+            Page<Record> list = getBureauList(11, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }

src/main/resource/Sql/collect.sql

@@ -24,20 +24,11 @@
 
     -- 获取单位列表
     #sql("getBureauList")
-        select * from t_base_organization  where 1=1
+        select * from t_base_organization  where level_id=1
         #if(org_type_id)
             and org_type_id=#(org_type_id)
         #end
-        #if(school_type_id)
-            and school_type_id =#(school_type_id)
-        #end
-        and level_id=1
-        #if(city_id)
         and city_id=#para(city_id)
-        #end
-        #if(area_id)
-            and area_id=#para(area_id)
-        #end
         order by org_name
     #end
     -- 任务列表