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

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

@@ -318,13 +318,13 @@ public class ZbdcModel {
             c = c.substring(0, c.length() - 4);
         }
 
-        String sql = "select * from t_zbdc_templet where km_code=?";
-        if (!StrKit.isBlank(c)) sql += c;
-        sql += " order by templet_id";
-        Page<Record> list = Db.paginate(page, limit, sql, km_code);
+        String sqlExceptSelect= "from t_zbdc_templet where km_code='" + km_code + "'";
+        if (!StrKit.isBlank(c)) sqlExceptSelect += c;
+        sqlExceptSelect += " order by templet_id";
+        Page<Record> list = Db.paginate(page, limit, "select *", sqlExceptSelect);
 
         //获取此单位已填报的内容
-        sql = "select templet_id,bureau_id,bureau_name,xysl,update_ts from t_zbdc_fill where year=? and bureau_id=?";
+        String sql = "select templet_id,bureau_id,xysl,update_ts from t_zbdc_fill where year=? and bureau_id=?";
         List<Record> fillList = Db.find(sql, year, bureau_id);
         Map<Integer, Float> _map = new HashMap<>();
         for (Record record : fillList) {