From 53b5ea2b96d76b2072819f14a48f26c58cea0f84 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 08:59:46 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/resources/mapper/ProductModelMapper.xml | 2 +-
sys/src/main/resources/application-dev.yml | 6 +++++-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 147cefe..81594ba 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -69,6 +69,7 @@
@DeleteMapping("/deleteList")
@AuthHandler
public Result<?> deleteList(String ids) {
+ if(ids==null||ids.equals(""))return Result.fail();
MyUtil.PrintLog(ids);
productService.deleteList(ids);
return Result.success("鍒犻櫎鎴愬姛");
diff --git a/standard-server/src/main/resources/mapper/ProductModelMapper.xml b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
index 8488506..aaa8c13 100644
--- a/standard-server/src/main/resources/mapper/ProductModelMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductModelMapper.xml
@@ -52,7 +52,7 @@
<!--娣诲姞鏍囧噯閫夋嫨鏍峰搧鍚嶇О-->
<select id="selectmater" resultType="java.lang.String">
- select material
+ select DISTINCT material
from lims_laboratory.product_model
where state = 1
</select>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 5bcc703..85cf887 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -43,6 +43,9 @@
url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
+# url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# username: root
+# password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
initialSize: 5 # 鍒濆杩炴帴鏁�
@@ -65,7 +68,8 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.110.209
+ host: 192.168.110.209
+# host: localhost
# redis绔彛锛堥粯璁や负6379锛�
port: 6380
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3