Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseTaskMapper.java

@@ -53,7 +53,10 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
                         WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')");
                     }
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT = #{dto.engineeringManagementUnit}");
+                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')");
+                    }
+                    if(StringUtils.isNotBlank(dto.getDikeName())){
+                        WHERE("xx.dike_name LIKE CONCAT('%',#{dto.dikeName},'%')");
                     }
                 }
                 ORDER_BY("rw.done_time asc", "rw.update_time DESC");

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseTaskMapper.java

@@ -52,7 +52,10 @@ public interface SzSuperviseTaskMapper extends BaseMapper<SzSuperviseTask> {
                         WHERE("rw.name LIKE CONCAT('%',#{dto.name},'%')");
                     }
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT = #{dto.engineeringManagementUnit}");
+                        WHERE("gl.ENGINEERING_MANAGEMENT_UNIT like concat('%', #{dto.engineeringManagementUnit}, '%')");
+                    }
+                    if(StringUtils.isNotBlank(dto.getWagaName())){
+                        WHERE("xx.waga_name LIKE CONCAT('%',#{dto.wagaName},'%')");
                     }
                 }
                 ORDER_BY("rw.done_time asc", "rw.update_time DESC");