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

src/main/java/UnitTest/TestPgRole.java

@@ -12,8 +12,6 @@ import java.util.List;
 
 public class TestPgRole {
 
-
-
     public static void main(String[] args) {
         //初始化
         SyncUtil.init();

src/main/java/com/dsideal/QingLong/Base/Model/BaseModel.java

@@ -551,14 +551,19 @@ public class BaseModel {
             kv.set("city_id", city_id);
             kv.set("area_id", area_id);
         }
-        kv.set("flag",flag);
+        kv.set("flag", flag);
+        SqlPara sqlPara;
         if (flag == 1) {//查询已打卡学校
-            SqlPara sqlPara = Db.getSqlPara("Base.listDaKa", kv);
-            return Db.paginate(page, limit, sqlPara);
+            sqlPara = Db.getSqlPara("Base.listDaKa", kv);
+
         } else {//查询未打卡学校
-            SqlPara sqlPara = Db.getSqlPara("Base.listNoDaKa", kv);
-            return Db.paginate(page, limit, sqlPara);
+            sqlPara = Db.getSqlPara("Base.listNoDaKa", kv);
+        }
+        Page<Record> list = Db.paginate(page, limit, sqlPara);
+        for (Record record : list.getList()) {
+            record.set("flag", flag);
         }
+        return list;
     }
 
     /**

src/main/resource/Sql/base.sql

@@ -174,8 +174,7 @@
     #end
     -- 未打卡
     #sql("listNoDaKa")
-        select t1.org_id as bureau_id,t1.org_name as bureau_name,'--' as teacher_count,'--' as student_count,'--' as class_count,'--' as wait_teacher_count,'--' as wait_student_count,
-               #para(flag) as flag
+        select t1.org_id as bureau_id,t1.org_name as bureau_name,'--' as teacher_count,'--' as student_count,'--' as class_count,'--' as wait_teacher_count,'--' as wait_student_count
         from t_base_organization as t1 where t1.b_use=1 and t1.org_id=t1.bureau_id and org_type_id in (8,9,15,16)
         #if(city_id)
             and t1.city_id=#para(city_id)
@@ -187,7 +186,7 @@
     #end
     -- 已打卡                                                                                    -- 未打卡
     #sql("listDaKa")
-        select t1.*,t2.org_name as bureau_name, #para(flag) as flag from t_base_daka as t1 inner join t_base_organization as t2 on t1.bureau_id=t2.org_id where t1.term_id=#para(term_id) and t1.b_use=1
+        select t1.*,t2.org_name as bureau_name from t_base_daka as t1 inner join t_base_organization as t2 on t1.bureau_id=t2.org_id where t1.term_id=#para(term_id) and t1.b_use=1
         #if(city_id)
             and t2.city_id=#para(city_id)
         #end