【ID1000454】仪器管理-用户仪器绑定【手机号码】搜索异常，无法输入搜索

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();
+        if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null
-        wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
+                && wxUserInstrument.getUserPhone() == null)) {
-        if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
+            WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
-            wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(",")));
+            wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
-        }
+            if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
-        wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone());
+                wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(",")));
-        List<WxUserMember> wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
+            }
-        if(wxUserMemberList != null && wxUserMemberList.size() > 0) {
+            wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone());
-            String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(","));
+            List<WxUserMember> wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
-            wxUserInstrument.setUserIds(collect);
+            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) {
-        // 用户相关信息
+        if(!(wxUserInstrument.getNickName() == null && wxUserInstrument.getUserIdArray() == null
-        WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
+                && wxUserInstrument.getUserPhone() == null)) {
-        wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
+            WxUserMemberVm wxUserMemberVm = new WxUserMemberVm();
-        if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
+            wxUserMemberVm.setNickname(wxUserInstrument.getNickName());
-            wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(",")));
+            if(wxUserInstrument.getUserIdArray() != null && wxUserInstrument.getUserIdArray().size() > 0) {
-        }
+                wxUserMemberVm.setId(wxUserInstrument.getUserIdArray().stream().map(String::valueOf).collect(Collectors.joining(",")));
-        wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone());
+            }
-        List<WxUserMember> wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
+            wxUserMemberVm.setMobile(wxUserInstrument.getUserPhone());
-        if(wxUserMemberList != null && wxUserMemberList.size() > 0) {
+            List<WxUserMember> wxUserMemberList = wxUserMemberService.selectWxUserMemberList(wxUserMemberVm);
-            String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(","));
+            if(wxUserMemberList != null && wxUserMemberList.size() > 0) {
-            wxUserInstrument.setUserIds(collect);
+                String collect = wxUserMemberList.stream().map(WxUserMember::getId).map(String::valueOf).collect(Collectors.joining(","));
+                wxUserInstrument.setUserIds(collect);
+            } else {
+                wxUserInstrument.setUserIds("0L");
+            }
         }
 
         List<WxUserInstrumentExportVm> userInstrumentExportData = wxUserInstrumentService.findUserInstrumentExportData(wxUserInstrument);