Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -1450,21 +1450,21 @@ public class ZbdcModel {
         //如果当前人员是长春市教育局的审核员
         String sql;
         if (bureau_id.equals("5CE95FA9-B866-473D-862F-55C813CCCA4C")) {
-            sql = "from t_base_organization where org_id=bureau_id and org_type_id=9 and org_name like '%" + keyword + "%' ";
-            if (school_type_id > 0) sql += " and school_type_id=" + school_type_id;
+            sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=t1.bureau_id and t1.org_type_id=9 and t1.org_name like '%" + keyword + "%' ";
+            if (school_type_id > 0) sql += " and t1.school_type_id=" + school_type_id;
             sql += Conditions;
         } else {//县区审核员
             sql = "select * from t_base_organization where org_id=?";
             String area_id = Db.findFirst(sql, bureau_id).getStr("area_id");
 
             //找到区域下的学校
-            sql = "from t_base_organization where org_id=bureau_id and org_type_id=16 and area_id='" + area_id +
-                    "' and org_name like '%" + keyword + "%' ";
+            sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=t1.bureau_id and t1.org_type_id=16 and t1.area_id='" + area_id +
+                    "' and t1.org_name like '%" + keyword + "%' ";
             if (school_type_id > 0)
-                sql += "and school_type_id=" + school_type_id;
+                sql += "and t1.school_type_id=" + school_type_id;
             sql += Conditions;
         }
-        Page<Record> p = Db.paginate(page, limit, "select * ", sql);
+        Page<Record> p = Db.paginate(page, limit, "select t1.*,t2.school_type_name,"+check_type_id+" as check_type_id", sql);
         return p;
     }
 }