aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-07 12:31:41 +08:00
parent 0d9bf046ee
commit 758a445d43
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisStaffController.java
View File

@ -56,27 +56,31 @@ public class EmisStaffController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:user:list')") // @PreAuthorize("@ss.hasPermi('system:user:list')")
@JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/getStaffList") @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; Long[] postIds = null;
if(!StringUtils.isEmpty(postCode)) { if(!StringUtils.isEmpty(postCode)) {
SysPost sysPost = new SysPost(); SysPost sysPost = new SysPost();
sysPost.setPostCode(postCode); sysPost.setPostCode(postCode);
List<SysPost> listPost = postService.selectPostList(sysPost); List<SysPost> listPost = postService.selectPostList(sysPost);
if(!CollectionUtil.isNotEmpty(listPost) && listPost.size() >0) { if(!CollectionUtil.isEmpty(listPost)) {
postIds = new Long[]{listPost.get(0).getPostId()}; postIds = new Long[]{listPost.get(0).getPostId()};
queryUser.setPostIds(postIds);
} }
} }
// 取当前登录用户所在网点操作员 if(!StringUtils.isEmpty(empCode)) {
SysUser queryUser = new SysUser(); queryUser.setEmpCode(empCode);
SysUser currentUser = getLoginUser().getUser(); }
// 总部可以查看所有，其他站点只能看自己的员工 // 总部可以查看所有，其他站点只能看自己的员工
SysUser currentUser = getLoginUser().getUser();
if(!currentUser.isTopSite()) { if(!currentUser.isTopSite()) {
queryUser.setOwnerSiteCode(currentUser.getOwnerSiteCode()); queryUser.setOwnerSiteCode(currentUser.getOwnerSiteCode());
} }
queryUser.setPostIds(postIds);
queryUser.setSearchValue(searchValue); queryUser.setSearchValue(searchValue);
startPage(); startPage();
List<SysUser> list = userService.selectUserList(queryUser); List<SysUser> list = userService.selectUserList(queryUser);

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuotePriceServiceImpl.java
View File

@ -77,7 +77,7 @@ public class EmisQuotePriceServiceImpl implements IEmisQuotePriceService
emisQuotePriceMapper.insertEmisQuotePrice(emisQuotePrice); emisQuotePriceMapper.insertEmisQuotePrice(emisQuotePrice);
// 插入子表达式 // 插入子表达式
if(CollectionUtil.isNotEmpty(emisQuotePrice.getExprList()) ){ if(!CollectionUtil.isEmpty(emisQuotePrice.getExprList()) ){
for (EmisQuoteExpression emisQuoteExpression:emisQuotePrice.getExprList()){ for (EmisQuoteExpression emisQuoteExpression:emisQuotePrice.getExprList()){
emisQuoteExpression.setId(null); emisQuoteExpression.setId(null);
emisQuoteExpression.setQuoteId(emisQuotePrice.getQuoteId()); emisQuoteExpression.setQuoteId(emisQuotePrice.getQuoteId());

2
emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsCusNoGeneratorService.java
View File

@ -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)); long n = Long.parseLong(maxid.substring(0, maxid.length() - 2));
result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100)); result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100));
} else { } else {

2
emis-wms/src/main/java/com/xdadan/erp/wms/service/idgen/WmsWhsCodeGeneratorService.java
View File

@ -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)); long n = Long.parseLong(maxid.substring(0, maxid.length() - 2));
result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100)); result = "" + (n + 1) + String.format("%02d", new Random().nextInt(100));
} else { } else {