Merge remote-tracking branch 'origin/upgrade' into upgrade

2023-11-04 16:14:14 +08:00 · 2023-11-04 16:14:14 +08:00 · 78a039d21a
commit 78a039d21a
parent e28f74d893 56cfc9f68e
1 changed files with 80 additions and 77 deletions
--- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
+++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
@ -1013,6 +1013,9 @@
            population_population_info t1
        WHERE
            t1.is_delete = 0
+        <if test="creator != null and creator != ''">
+            AND t1.creator = #{creator}
+        </if>
        <if test="idcard != null and idcard != ''">
            AND t1.idcard LIKE CONCAT('%', #{idcard}, '%')
        </if>