From f04c1a5a967679b9984926af72be8a3d3f26c2bb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/StandardsMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/StandardsMapper.xml b/standard-server/src/main/resources/mapper/StandardsMapper.xml
index 35264ea..07d18b5 100644
--- a/standard-server/src/main/resources/mapper/StandardsMapper.xml
+++ b/standard-server/src/main/resources/mapper/StandardsMapper.xml
@@ -2,12 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.StandardsMapper">
- <select id="listStandardsInformation" resultType="Map">
+ <select id="listPageStandardsInformation" resultType="Map">
SELECT s.`id`, s.`name`, s.`eng_name`, DATE_FORMAT(s.`create_time`, '%Y-%m-%d %H:%i') createTime
FROM standards s
<if test="idOrNameOfStandards != null">
WHERE s.`id` LIKE concat('%',#{idOrNameOfStandards},'%')
- OR s.name LIKE concat('%',#{idOrNameOfStandards},'%')
+ OR s.name LIKE concat('%',#{idOrNameOfStandards},'%')
</if>
</select>
</mapper>
--
Gitblit v1.9.3