diff --git a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java index 489a5b9..7db9e08 100644 --- a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java +++ b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java @@ -38,7 +38,7 @@ public class RetailCompanyController extends BaseController { /** * 查询用户零售公司 - * @param companyId 父区域id + * @param parentId 父区域id * @param userId 用户id * @param level 区域等级 * @return @@ -46,9 +46,9 @@ public class RetailCompanyController extends BaseController { @ResponseBody @GetMapping("/user/company") - public Map getUserOrg(Long companyId,@RequestParam("userId") long userId,@RequestParam("level") int level){ + public Map getUserOrg(Long parentId,@RequestParam("userId") long userId,@RequestParam("level") int level){ try{ - List privilageOrganizationals = retailCompanyService.getUserOrg(companyId,userId,level); + List privilageOrganizationals = retailCompanyService.getUserOrg(parentId,userId,level); return data(privilageOrganizationals); }catch (Exception e){ log.error("查询用户零售公司",e); diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index 5764330..8356109 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -68,12 +68,12 @@ public class RetailCompanyService { /** * 找到用户公司 - * @param companyId 父区域id + * @param parentId 父区域id * @param userId 用户id * @param level 等级 * @return */ - public List getUserOrg(Long companyId, long userId, int level){ + public List getUserOrg(Long parentId, long userId, int level){ QueryWrapper wrapper1 = new QueryWrapper<>(); wrapper1.eq("user_id",userId); @@ -86,8 +86,8 @@ public class RetailCompanyService { wrapper.eq("type", 1).eq("status", 1).eq("level",level). in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId). collect(Collectors.toList())); - if(null != companyId){ - wrapper.eq("parent_id",companyId); + if(null != parentId){ + wrapper.eq("parent_id",parentId); } return retailCompanyMapper.selectList(wrapper); }