From a42f29ca6eb4ec9eeadda448b4bfe9cba1aca285 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 10 七月 2023 01:24:45 +0800
Subject: [PATCH] 按月交费功能开发完成

---
 service-user/src/main/java/com/java110/user/api/StaffApi.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/StaffApi.java b/service-user/src/main/java/com/java110/user/api/StaffApi.java
index 2c94e4e..64121c8 100755
--- a/service-user/src/main/java/com/java110/user/api/StaffApi.java
+++ b/service-user/src/main/java/com/java110/user/api/StaffApi.java
@@ -2,19 +2,18 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.app.AppDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.user.StaffAppAuthDto;
 import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.po.staffAppAuth.StaffAppAuthPo;
+import com.java110.po.user.StaffAppAuthPo;
 import com.java110.user.bmo.staffAppAuth.IDeleteStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.ISaveStaffAppAuthBMO;
 import com.java110.user.bmo.staffAppAuth.IUpdateStaffAppAuthBMO;
-import com.java110.utils.cache.MappingCache;
 import com.java110.utils.cache.UrlCache;
-import com.java110.utils.constant.MappingConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -116,13 +115,18 @@
     @RequestMapping(value = "/queryStaffAppAuth", method = RequestMethod.GET)
     public ResponseEntity<String> queryStaffAppAuth(@RequestHeader(value = "store-id") String storeId,
                                                     @RequestHeader(value = "user-id") String userId,
+                                                    @RequestParam(value = "staffId",required = false) String staffId,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) {
         StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
         staffAppAuthDto.setPage(page);
         staffAppAuthDto.setRow(row);
         staffAppAuthDto.setStoreId(storeId);
+
         staffAppAuthDto.setStaffId(userId);
+        if(!StringUtil.isEmpty(staffId)){
+            staffAppAuthDto.setStaffId(staffId);
+        }
         return getStaffAppAuthBMOImpl.get(staffAppAuthDto);
     }
 

--
Gitblit v1.8.0