From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 72ad32f..5b31620 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -1,8 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.limslaboratory.mapper.ProductModelMapper">
+ <resultMap id="selectproductModelMap" type="map">
+ <id property="name" column="father"/>
+ <collection property="children" resultMap="selectproductModelTowMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="selectproductModelTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unit" column="unit"/>
+ </resultMap>
<!--鏌ヨ鏍囧噯妯＄増鍒楄〃-->
- <select id="selectproductModel" resultType="java.util.Map">
+ <select id="selectproductModel" resultMap="selectproductModelMap">
select id,
father,
name,
@@ -16,7 +26,6 @@
<if test="father!=null and father!=''">
and father like concat('%',#{father},'%')
</if>
- order by father
</select>
<update id="delAllproductModel">
@@ -28,8 +37,7 @@
<select id="selectfather" resultType="java.lang.String">
SELECT DISTINCT father
FROM lims_laboratory.product_model
- WHERE father IS NOT NULL
- AND father != ''
+ WHERE state = 1
</select>
<!--鏌ヨ椤圭洰妯＄増鏍规嵁鏍峰搧鍚�-->
--
Gitblit v1.9.3