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/AttrSpecApi.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
index ed106ed..29d24f0 100755
--- a/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttrSpecApi.java
@@ -70,6 +70,7 @@
public ResponseEntity<String> updateAttrSpec(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "specCd", "璇锋眰鎶ユ枃涓湭鍖呭惈specCd");
+ Assert.hasKeyAndValue(reqJson, "specId", "璇锋眰鎶ユ枃涓湭鍖呭惈specId");
Assert.hasKeyAndValue(reqJson, "tableName", "璇锋眰鎶ユ枃涓湭鍖呭惈tableName");
Assert.hasKeyAndValue(reqJson, "specName", "璇锋眰鎶ユ枃涓湭鍖呭惈specName");
Assert.hasKeyAndValue(reqJson, "specHoldplace", "璇锋眰鎶ユ枃涓湭鍖呭惈specHoldplace");
@@ -95,9 +96,8 @@
*/
@RequestMapping(value = "/deleteAttrSpec", method = RequestMethod.POST)
public ResponseEntity<String> deleteAttrSpec(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasKeyAndValue(reqJson, "specCd", "specCd涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "specId", "specId涓嶈兘涓虹┖");
AttrSpecPo attrSpecPo = BeanConvertUtil.covertBean(reqJson, AttrSpecPo.class);
@@ -115,17 +115,19 @@
@RequestMapping(value = "/queryAttrSpec", method = RequestMethod.GET)
public ResponseEntity<String> queryAttrSpec(@RequestParam(value = "tableName", required = false) String tableName,
@RequestParam(value = "specCd", required = false) String specCd,
+ @RequestParam(value = "specId", required = false) String specId,
@RequestParam(value = "specName", required = false) String specName,
+ @RequestParam(value = "domain", required = false) String domain,
@RequestParam(value = "page", required = false) int page,
- @RequestParam(value = "row", required = false) int row
-
- ) {
+ @RequestParam(value = "row", required = false) int row) {
AttrSpecDto attrSpecDto = new AttrSpecDto();
attrSpecDto.setTableName(tableName);
attrSpecDto.setPage(page);
attrSpecDto.setRow(row);
attrSpecDto.setSpecCd(specCd);
attrSpecDto.setSpecName(specName);
+ attrSpecDto.setDomain(domain);
+ attrSpecDto.setSpecId(specId);
return getAttrSpecBMOImpl.get(attrSpecDto);
}
}
--
Gitblit v1.8.0