From c04f2d4a58bd72449b2212ed2f8b0c3ac9ec96be Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 12 八月 2025 11:04:16 +0800
Subject: [PATCH] 修改
---
hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java | 12 ++++++------
hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml | 3 +++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java
index ae0d91c..dbb68db 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/domain/HzHazmatBasic.java
@@ -61,13 +61,13 @@
@TableField("hazmat_character")
private String hazmatCharacter;
- @NotBlank(message = "供应商不能为空")
- @ApiModelProperty(value = "供应商",required = true)
+
+ @ApiModelProperty(value = "供应商")
@TableField("supplier")
private String supplier;
- @NotBlank(message = "厂家不能为空")
- @ApiModelProperty(value = "厂家",required = true)
+
+ @ApiModelProperty(value = "厂家")
@TableField("manufacturer")
private String manufacturer;
@@ -96,8 +96,8 @@
@TableField("unit")
private String unit;
- @NotNull(message = "含税价格不能为空")
- @ApiModelProperty(value = "含税价格",required = true)
+
+ @ApiModelProperty(value = "含税价格")
@TableField("price")
private BigDecimal price;
diff --git a/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml b/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
index fd1c267..60f0ced 100644
--- a/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -50,6 +50,9 @@
<if test="username != null and username != ''">
AND u.username like concat('%', #{username}, '%')
</if>
+ <if test="name!=null and name!=''">
+ and u.name like concat('%',#{name},'%')
+ </if>
<if test="status != null and status != ''">
AND u.status = #{status}
</if>
--
Gitblit v1.9.2