diff --git a/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java b/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java index b169ff6..4af1fd0 100644 --- a/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java +++ b/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java @@ -11,7 +11,7 @@ public interface CompanyService extends IService<Company>{ public List<Company> selectCompanyByCurrentUserId(); - public List<Company> selectCompanyByUserId(); + public List<Company> selectCompanyByUserId(Integer id); public AjaxResult addCompany(Company company); diff --git a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java index c5f398d..e61447d 100644 --- a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java +++ b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java @@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl * @return */ @Override - public List<Company> selectCompanyByUserId() { + public List<Company> selectCompanyByUserId(Integer id) { UserCompany condition = new UserCompany(); - condition.setUserId(ShiroUtils.getUserId()); + condition.setUserId(id); List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition); Company company = new Company(); company.setWarehouseCode(ShiroUtils.getWarehouseCode()); diff --git a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java index 8aa4411..43c125d 100644 --- a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java +++ b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java @@ -154,7 +154,7 @@ public class UserController extends BaseController { mmap.put("user", userService.selectUserById(id)); mmap.put("roles", roleService.selectRolesByUserId(id)); - mmap.put("companys", companyService.selectCompanyByUserId()); + mmap.put("companys", companyService.selectCompanyByUserId(id)); mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id)); return prefix + "/edit"; }