|
@@ -86,14 +86,16 @@ public class ProductController {
|
|
queryWrapper.like("product_name", productName);
|
|
queryWrapper.like("product_name", productName);
|
|
}
|
|
}
|
|
|
|
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
- if (!"admin".equals(roleCode)) {
|
|
|
|
- QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
- userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
|
- userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
- userCompanyQueryWrapper.last("limit 1");
|
|
|
|
- UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
- queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
|
|
+ if (!"admin".equals(roleCode)) {
|
|
|
|
+ QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ userCompanyQueryWrapper.eq("user_id", userId);
|
|
|
|
+ userCompanyQueryWrapper.orderByDesc("create_time");
|
|
|
|
+ userCompanyQueryWrapper.last("limit 1");
|
|
|
|
+ UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
|
|
+ queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
Page<Product> page = new Page<>(pageNo, pageSize);
|
|
Page<Product> page = new Page<>(pageNo, pageSize);
|
|
IPage<Product> pageList = productService.page(page, queryWrapper);
|
|
IPage<Product> pageList = productService.page(page, queryWrapper);
|