From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/api/AttrValueApi.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
index 798d447..cb87162 100755
--- a/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrValueApi.java
@@ -43,7 +43,7 @@
@RequestMapping(value = "/saveAttrValue", method = RequestMethod.POST)
public ResponseEntity<String> saveAttrValue(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+ Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -64,7 +64,7 @@
@RequestMapping(value = "/updateAttrValue", method = RequestMethod.POST)
public ResponseEntity<String> updateAttrValue(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+ Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
Assert.hasKeyAndValue(reqJson, "value", "璇锋眰鎶ユ枃涓湭鍖呭惈value");
Assert.hasKeyAndValue(reqJson, "valueName", "璇锋眰鎶ユ枃涓湭鍖呭惈valueName");
Assert.hasKeyAndValue(reqJson, "valueShow", "璇锋眰鎶ユ枃涓湭鍖呭惈valueShow");
@@ -106,7 +106,8 @@
* valueName: '',
*/
@RequestMapping(value = "/queryAttrValue", method = RequestMethod.GET)
- public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd") String specCd,
+ public ResponseEntity<String> queryAttrValue(@RequestParam(value = "specCd",required = false) String specCd,
+ @RequestParam(value = "specId",required = false) String specId,
@RequestParam(value = "page", required = false) int page,
@RequestParam(value = "row", required = false) int row,
@RequestParam(value = "value", required = false) String value,
@@ -122,6 +123,7 @@
attrValueDto.setValueName(valueName);
attrValueDto.setValueShow(valueShow);
attrValueDto.setDomain(domain);
+ attrValueDto.setSpecId(specId);
return getAttrValueBMOImpl.get(attrValueDto);
}
}
\ No newline at end of file
--
Gitblit v1.8.0