From f95c2cc9d70420202c07d469b49303e7b3b0d094 Mon Sep 17 00:00:00 2001 From: chenhuan <czj123456> Date: 星期五, 17 五月 2024 10:03:05 +0800 Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang --- javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml index 070168f..2648c83 100644 --- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml +++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml @@ -26,7 +26,9 @@ <select id="selectProjectDataList" parameterType="ProjectData" resultMap="ProjectDataResult"> <include refid="selectProjectDataVo"/> - <where> + <where> + <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if> + <if test="holeId != null and holeId != ''"> and hole_id = #{holeId}</if> <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> <if test="dataType != null and dataType != ''"> and data_type = #{dataType}</if> <if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if> -- Gitblit v1.9.1