diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java index 7927ccc..c00d28f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java @@ -130,7 +130,7 @@ public class HomePageSubController extends BaseController { @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) @GetMapping("/getTeamMsg") @SysLog(title = "班组详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "班组详情") - public TableDataInfo getTeamMsg(HomePagePo o) { + public TableDataInfo getTeamMsg(HomePagePoVo o) { try { if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){ Map map = dealWithPermission(); @@ -333,7 +333,7 @@ public class HomePageSubController extends BaseController { @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query")) @PostMapping("/teamExport") @SysLog(title = "班组导出", businessType = OperaType.EXPORT, logType = 0, module = "首页->二级页面", details = "班组导出") - public void teamExport(HttpServletResponse response, HomePagePo o) { + public void teamExport(HttpServletResponse response, HomePagePoVo o) { try { if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){ Map map = dealWithPermission(); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java index 3904805..1170b50 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java @@ -36,7 +36,7 @@ public interface HomePageSubMapper { * @param o * @return */ - List getTeamMsg(HomePagePo o); + List getTeamMsg(HomePagePoVo o); /** * 获取人员详情 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java index 063824b..28233e0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java @@ -35,7 +35,7 @@ public interface HomePageSubService { * @param o * @return */ - List getTeamMsg(HomePagePo o); + List getTeamMsg(HomePagePoVo o); /** * 人员详情 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java index 95873df..7942320 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java @@ -43,8 +43,12 @@ public class HomePageSubServiceImpl implements HomePageSubService { } @Override - public List getTeamMsg(HomePagePo o) { - + public List getTeamMsg(HomePagePoVo o) { + if (o.getProId() != null){ + String[] split = o.getProId().split(","); + o.setProIds(Arrays.asList(split)); + o.setProId(null); + } return mapper.getTeamMsg(o); } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml index 96cd756..a362457 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml @@ -232,6 +232,12 @@ AND pp.id = #{proId} + + AND pp.id IN + + #{item} + + AND ps.id = #{subId}