From 89b41bcf5bb89c9c006c2a450e4de5e3ed1d8907 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 23 Apr 2024 13:30:41 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisStaffController.java     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
index 30cb643d4..fe4e43762 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
@@ -25,6 +25,7 @@ import com.xdadan.erp.emis.service.IEmisCountryService;
 import com.xdadan.erp.system.domain.SysPost;
 import com.xdadan.erp.system.service.ISysPostService;
 import com.xdadan.erp.system.service.ISysUserService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -54,18 +55,22 @@ public class EmisStaffController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @JacksonFilter(include= {"empCode","empName","ownerSiteCode"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/getPickStaffList")
-    public TableDataInfo getPickStaffList(String siteCode)
+    public TableDataInfo getPickStaffList(@RequestParam("siteCode")String siteCode,@RequestParam("postCode")String postCode)
     {
-        SysPost sysPost = new SysPost();
-        sysPost.setPostCode("RSD");
-        List<SysPost> listPost=postService.selectPostList(sysPost);
 
-        Long[] postIds = {listPost.get(0).getPostId()};
+        Long[] postIds = null;
+        if(!StringUtils.isEmpty(postCode)) {
+            SysPost sysPost = new SysPost();
+            sysPost.setPostCode(postCode);
+            List<SysPost> listPost = postService.selectPostList(sysPost);
+            postIds = new Long[]{listPost.get(0).getPostId()};
+        }
 
         // 取当前登录用户所在网点操作员
         SysUser qParamUser = new SysUser();
-        if(siteCode==null) {
-            qParamUser.setOwnerSiteCode(getLoginUser().getUser().getOwnerSiteCode());
+        String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode();
+        if(!StringUtils.isEmpty(siteCode) && !"88888".equals(ownerSiteCode)) {
+            qParamUser.setOwnerSiteCode(siteCode);
         }
         qParamUser.setPostIds(postIds);
         startPage();