代码冲突解决

2023-04-18 10:11:05 +08:00 · 2023-04-18 10:11:05 +08:00 · 51136e2658
parent 16eedaf39c f5427555d8
commit 51136e2658
1 changed files with 1 additions and 1 deletions
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@ -229,7 +229,7 @@
                AND di.respond_status > 1
            </if>
            <if test="chiefId != null" >
-                di.chief_id = #{chiefId}
+                and di.chief_id = #{chiefId}
            </if>
        GROUP BY date
    </select>