From 22899f74279a47f4ec79e1325f8489d948ced005 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 九月 2023 17:24:44 +0800
Subject: [PATCH] 修改2.0 9.15
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index c0424b4..7c484bb 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -53,8 +53,8 @@
//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓
@Override
- public List<Map<String, Object>> chooseTech(Integer specificationsId) {
- return technologyMapper.chooseTech(specificationsId);
+ public List<Map<String, Object>> chooseTech(Integer specificationsId, Integer version) {
+ return technologyMapper.chooseTech(specificationsId, version);
}
//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨椤圭洰鐖剁被
@@ -69,13 +69,13 @@
Product product = new Product();
String required = productDto.getRequired();
String internal = productDto.getInternal();
- if (ObjectUtils.isNotEmpty(required)){
+ if (ObjectUtils.isNotEmpty(required)) {
char requ = required.charAt(0);
if (requ != '>' && requ != '<' && requ != '=') {
return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
}
}
- if (ObjectUtils.isNotEmpty(internal)){
+ if (ObjectUtils.isNotEmpty(internal)) {
char inter = internal.charAt(0);
if (inter != '>' && inter != '<' && inter != '=') {
return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
@@ -90,14 +90,18 @@
@Override
public String write(Integer id, String required, String internal) {
//鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
+ if (ObjectUtils.isNotEmpty(internal)) {
char inter = internal.charAt(0);
- char requ = required.charAt(0);
if (inter != '>' && inter != '<' && inter != '=') {
return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
}
+ }
+ if (ObjectUtils.isNotEmpty(required)) {
+ char requ = required.charAt(0);
if (requ != '>' && requ != '<' && requ != '=') {
return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
}
+ }
Product product = new Product();
product.setId(id);
product.setRequired(required);
--
Gitblit v1.9.3