修改查询核查报错

siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TDkjbxxHcServiceImpl.java

@@ -64,7 +64,7 @@ public class TDkjbxxHcServiceImpl implements ITDkjbxxHcService {
 
     @Override
     public List<TDkjbxxHc> selectTDkjbxxHcInfo(String fieldworkId, String dkid, String auditflowStep, String auditflowId) {
-        if (StringUtils.isNotEmpty(dkid) && StringUtils.isNotEmpty(fieldworkId)) {
+        if (StringUtils.isEmpty(dkid) && StringUtils.isEmpty(fieldworkId)) {
             return null;
         }
         if (StringUtils.isEmpty(auditflowStep)) {

siwei-modules/siwei-rsmonitoring/src/main/resources/mapper/postgresql/TDkjbxxHcMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditflowId != null  and auditflowId != ''"> and auditflow_id = #{auditflowId}</if>
             <if test="auditflowStep != null  and auditflowStep != ''"> and auditflow_step = #{auditflowStep}</if>
             <if test="sign != null  and sign != ''"> and sign = #{sign}</if>
-            <if test="fieldworkId != null and fieldworkId != ''">and fieldwork_id=#{fieldworkId},</if>
+            <if test="fieldworkId != null and fieldworkId != ''"> and fieldwork_id=#{fieldworkId}</if>
         </where>
     </select>