public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
duxp 2023-09-14 11:48:10 +08:00
parent 195b5045aa eb628ea63c
commit 376087b8c0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cyx-admin/pom.xml
View File

@ -67,6 +67,12 @@
<artifactId>cyx-generator</artifactId> <artifactId>cyx-generator</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.13.3</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

1
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shotName != null and shotName != ''"> and a.shot_name = #{shotName}</if> <if test="shotName != null and shotName != ''"> and a.shot_name = #{shotName}</if>
<if test="unit != null and unit != ''"> and a.unit = #{unit}</if> <if test="unit != null and unit != ''"> and a.unit = #{unit}</if>
<if test="target != null and target != ''"> and a.target = #{target}</if> <if test="target != null and target != ''"> and a.target = #{target}</if>
<if test="zhiwu != null and zhiwu != ''"> and b.party_duties = #{zhiwu}</if>
<!-- <if test="target != null and target != ''">--> <!-- <if test="target != null and target != ''">-->
<!-- AND a.target like concat('%', #{target}, '%')--> <!-- AND a.target like concat('%', #{target}, '%')-->
<!-- </if>--> <!-- </if>-->