From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-acct/src/main/java/com/java110/acct/api/AccountApi.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
index 5116c04..5734bed 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
@@ -14,7 +14,7 @@
 import com.java110.intf.store.IContractInnerServiceSMO;
 import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
-import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.po.account.AccountDetailPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,12 +64,17 @@
      */
     @RequestMapping(value = "/queryAccount", method = RequestMethod.GET)
     public ResponseEntity<String> queryAccount(@RequestHeader(value = "store-id", required = false) String storeId,
+                                               @RequestParam(value = "shopId", required = false) String shopId,
                                                @RequestParam(value = "page") int page,
                                                @RequestParam(value = "row") int row) {
         AccountDto accountDto = new AccountDto();
         accountDto.setPage(page);
         accountDto.setRow(row);
-        accountDto.setObjId(storeId);
+        if(!StringUtil.isEmpty(shopId)){
+            accountDto.setObjId(shopId);
+        }else {
+            accountDto.setObjId(storeId);
+        }
         return getAccountBMOImpl.get(accountDto);
     }
 

--
Gitblit v1.8.0