'commit'

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

@@ -592,18 +592,6 @@ public class CollectController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-    /**
-     * 市直属下拉框
-     *
-     * @return
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    public void getShiZhiType() {
-        List<Record> list = cm.getShiZhiType();
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
-
     /**
      * 功能：获取单位列表
      *

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

@@ -720,15 +720,6 @@ public class CollectModel {
         return Db.find(sqlPara);
     }
 
-    /**
-     * 市直属下拉框
-     *
-     * @return
-     */
-    public List<Record> getShiZhiType() {
-        SqlPara sqlPara = Db.getSqlPara("Collect.getShiZhiType");
-        return Db.find(sqlPara);
-    }
 
     /**
      * 功能：获取单位列表

src/main/resource/Sql/collect.sql

@@ -19,13 +19,11 @@
     #end
     -- 获取单位类型
     #sql("getBureauType")
-        select id,name from t_base_org_type_principalship where id in (5,9,11) and b_use=1 order by id
-    #end
-    -- 市直属下拉框
-    #sql("getShiZhiType")
-        select 1 as level_id,'市直' as level_name
+        select 5 as id ,'市直教辅单位' as name
+        union
+        select 9 as id ,'市直学校' as name
         union
-        select 0 as level_id,'其它' as level_name
+        select 11 as id ,'区县教育局' as name
     #end
 
     -- 获取单位列表