diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java index cc5155f..7485b15 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentController.java @@ -56,16 +56,21 @@ public class WxUserInstrumentController extends BaseController public TableDataInfo list(WxUserInstrument wxUserInstrument) { // 用户相关信息 - WxUserMemberVm wxUserMemberVm = new WxUserMemberVm(); - wxUserMemberVm.setNickname(wxUserInstrument.getNickName()); - if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) { - wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(","))); - } - wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone()); - List wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); - if(wxUserMemberList != null && wxUserMemberList.size() > 0) { - String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(",")); - wxUserInstrument.setUserIds(collect); + if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null + && wxUserInstrument.getUserPhone() == null)) { + WxUserMemberVm wxUserMemberVm = new WxUserMemberVm(); + wxUserMemberVm.setNickname(wxUserInstrument.getNickName()); + if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) { + wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(","))); + } + wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone()); + List wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); + if(wxUserMemberList != null && wxUserMemberList.size() > 0) { + String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(",")); + wxUserInstrument.setUserIds(collect); + } else { + wxUserInstrument.setUserIds("0L"); + } } startPage(); @@ -167,17 +172,21 @@ public class WxUserInstrumentController extends BaseController @Log(title = "批量导出", businessType = BusinessType.EXPORT) @PostMapping("/batchExport") public void batchExport(HttpServletResponse response, WxUserInstrument wxUserInstrument) { - // 用户相关信息 - WxUserMemberVm wxUserMemberVm = new WxUserMemberVm(); - wxUserMemberVm.setNickname(wxUserInstrument.getNickName()); - if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) { - wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(","))); - } - wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone()); - List wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); - if(wxUserMemberList != null && wxUserMemberList.size() > 0) { - String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(",")); - wxUserInstrument.setUserIds(collect); + if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null + && wxUserInstrument.getUserPhone() == null)) { + WxUserMemberVm wxUserMemberVm = new WxUserMemberVm(); + wxUserMemberVm.setNickname(wxUserInstrument.getNickName()); + if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) { + wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(","))); + } + wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone()); + List wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm); + if(wxUserMemberList != null && wxUserMemberList.size() > 0) { + String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(",")); + wxUserInstrument.setUserIds(collect); + } else { + wxUserInstrument.setUserIds("0L"); + } } List userInstrumentExportData = wxUserInstrumentService.findUserInstrumentExportData(wxUserInstrument);