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 7bab66359..87f036069 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
@@ -56,27 +56,31 @@ public class EmisStaffController extends BaseController
 //    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/getStaffList")
-    public TableDataInfo getStaffList(String postCode,String searchValue)
+    public TableDataInfo getStaffList(String postCode,String empCode,String searchValue)
     {
+        SysUser queryUser = new SysUser();
 
         Long[] postIds = null;
         if(!StringUtils.isEmpty(postCode)) {
             SysPost sysPost = new SysPost();
             sysPost.setPostCode(postCode);
             List<SysPost> listPost = postService.selectPostList(sysPost);
-            if(!CollectionUtil.isNotEmpty(listPost) && listPost.size() >0) {
+            if(!CollectionUtil.isEmpty(listPost)) {
                 postIds = new Long[]{listPost.get(0).getPostId()};
+                queryUser.setPostIds(postIds);
             }
         }
 
-        // 取当前登录用户所在网点操作员
-        SysUser queryUser = new SysUser();
-        SysUser currentUser = getLoginUser().getUser();
+        if(!StringUtils.isEmpty(empCode)) {
+            queryUser.setEmpCode(empCode);
+        }
+
         // 总部可以查看所有，其他站点只能看自己的员工
+        SysUser currentUser = getLoginUser().getUser();
         if(!currentUser.isTopSite()) {
             queryUser.setOwnerSiteCode(currentUser.getOwnerSiteCode());
         }
-        queryUser.setPostIds(postIds);
+
         queryUser.setSearchValue(searchValue);
         startPage();
         List<SysUser> list = userService.selectUserList(queryUser);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
index 498e97ae2..854ce095f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
@@ -77,7 +77,7 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
         emisQuotePriceMapper.insertEmisQuotePrice(emisQuotePrice);
 
         // 插入子表达式
-        if(CollectionUtil.isNotEmpty(emisQuotePrice.getExprList()) ){
+        if(!CollectionUtil.isEmpty(emisQuotePrice.getExprList()) ){
             for (EmisQuoteExpression emisQuoteExpression:emisQuotePrice.getExprList()){
                 emisQuoteExpression.setId(null);
                 emisQuoteExpression.setQuoteId(emisQuotePrice.getQuoteId());
diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsCusNoGeneratorService.java b/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsCusNoGeneratorService.java
index 57b8fb958..ad1c837a9 100644
--- a/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsCusNoGeneratorService.java
+++ b/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsCusNoGeneratorService.java
@@ -55,7 +55,7 @@ public class WmsCusNoGeneratorService implements IdFactory.IdGenInterface{
             }
         }
 
-        if (StringUtils.isNotEmpty(maxid) && maxid.startsWith(year + month)) {
+        if (!StringUtils.isEmpty(maxid) && maxid.startsWith(year + month)) {
             long n = Long.parseLong(maxid.substring(0, maxid.length() - 2));
             result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100));
         } else {
diff --git a/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsWhsCodeGeneratorService.java b/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsWhsCodeGeneratorService.java
index 2aa12fe39..a96d61d0c 100644
--- a/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsWhsCodeGeneratorService.java
+++ b/emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsWhsCodeGeneratorService.java
@@ -55,7 +55,7 @@ public class WmsWhsCodeGeneratorService implements IdFactory.IdGenInterface{
             }
         }
 
-        if (StringUtils.isNotEmpty(maxid) && maxid.startsWith(year + month)) {
+        if (!StringUtils.isEmpty(maxid) && maxid.startsWith(year + month)) {
             long n = Long.parseLong(maxid.substring(0, maxid.length() - 2));
             result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100));
         } else {