'commit'

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

@@ -835,7 +835,7 @@ public class CollectModel {
         */
         List<Integer> OrgTypeList = new ArrayList<>();
         if (org_type_id != -1) OrgTypeList.add(org_type_id);
-        else{
+        else {
             if (query_type_id == 1) {
                 OrgTypeList.add(5);
                 OrgTypeList.add(8);

src/main/resource/Sql/Collect.sql

@@ -26,13 +26,11 @@
 
     -- 获取单位列表
     #sql("getBureauList")
-        select * from t_base_organization  where 1=1
+        select * from t_base_organization  where
+        city_id=#para(city_id)
         #if(org_name)
          and org_name like #para(org_name, "like")
         #end
-        #if(city_id)
-         and city_id=#para(city_id)
-        #end
         #if(area_id)
          and area_id=#para(area_id)
         #end
@@ -42,7 +40,6 @@
         #if(OrgTypeList)
          and org_type_id in #para(OrgTypeList, "in")
         #end
-        order by org_type_id,org_name
     #end
     -- 任务列表
     #sql("viewJobList")

src/main/resource/application.properties

@@ -4,7 +4,7 @@ user=postgres
 password=DsideaL147258369
 jdbcUrl=jdbc:postgresql://10.10.14.71:5432/szjz_db?reWriteBatchedInserts=true
 # 如果需要读写分离，就配置下面的jdbcUrlSlave,不需要注释掉就行
-jdbcUrlSlave=jdbc:postgresql://10.10.14.72:5432/szjz_db?reWriteBatchedInserts=true
+#jdbcUrlSlave=jdbc:postgresql://10.10.14.72:5432/szjz_db?reWriteBatchedInserts=true
 # redis
 redis_ip=10.10.14.14
 redis_port=18890