小程序修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -75,9 +75,16 @@ public class SysLoginController
         ajax.put(Constants.TOKEN, token);
         //根据userName查询用户
         SysUser user = userService.selectUserByUserName(loginBody.getUsername());
+        if(user==null){
+            return AjaxResult.error("账号不存在");
+        }
         ajax.put("userId", user.getUserId());
         //获取商家的信息
         SettledMerchants settledMerchants = settledMerchantsService.selectByPhone(user.getUserName());
+        if(!user.getUserName().equals("admin") && settledMerchants==null){
+            return AjaxResult.error("该账号无绑定商户");
+        }
+
         if(user.getUserName().equals("admin")){
             settledMerchants = new SettledMerchants();
             settledMerchants.setBusinessId(-1L);