From b0b8ca4b383c5c3a2373200ca1872c20ee9ff999 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 14:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 4 ++--
user-server/src/main/resources/mapper/MenuMapper.xml | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java | 2 +-
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java | 2 ++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
index b66eb6c..a327be4 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
@@ -18,8 +18,10 @@
@ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
private Long currentPage;
+
@ApiModelProperty(value = "姣忛〉澶氬皯鏉�", example = "10", required = true)
private Long pageSize;
+
@ApiModelProperty(value = "璁″垝鍗曞彿", required = false)
private String plannedOrderNumber;
}
diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 1a7b226..87445db 100644
--- a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -46,7 +46,7 @@
from metering_plan
where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
LIMIT #{limitPage.start},#{limitPage.end}) p
LEFT JOIN metrical_information i ON p.id = i.plan
@@ -56,7 +56,7 @@
<select id="getTotal" resultType="java.util.Map">
select count(id) num from metering_plan where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
</select>
<select id="getPlanMeasureInstrument"
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
index 5a9cd16..90affac 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
@@ -77,7 +77,7 @@
));
});
if(roleMenuList.size()<1){
- roleMenuList.add(new RoleMenu(null,nextId,39L,false,false,false,false,createTime));
+ roleMenuList.add(new RoleMenu(null,nextId,39L,true,false,false,false,createTime));
}
//roleMenuAddList.forEach(System.out::println);
int i = roleManageMapper.insertBatchRoleMenu(roleMenuList);
diff --git a/user-server/src/main/resources/mapper/MenuMapper.xml b/user-server/src/main/resources/mapper/MenuMapper.xml
index 6d55185..57e059e 100644
--- a/user-server/src/main/resources/mapper/MenuMapper.xml
+++ b/user-server/src/main/resources/mapper/MenuMapper.xml
@@ -7,7 +7,7 @@
from menu
where state = 1
and id != 39
- and parent_id != 39
+ and parent_id != 39
</select>
<select id="getMenuNameAndId" resultType="map">
select url, id, name
--
Gitblit v1.9.3