修改传参方式2

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -1,17 +1,15 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.entity.User;
 import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * <p>
  *  前端控制器
@@ -28,12 +26,13 @@ public class UserController {
 
     /**
      * 管理员登录网页端
-     * @param map
-     * @return
+     *
+     * 用户名 phone
+     * 密码 password
      */
     @RequestMapping("/login")
-    public HttpRespMsg login(@RequestBody Map<String,Object> map){
-        return userService.login((String)map.get("username"), (String)map.get("password"));
+    public HttpRespMsg login(User user){
+        return userService.login(user.getPhone(), user.getPassword());
     }
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -36,6 +36,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public HttpRespMsg login(String username, String password) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
+        if(username == null || password == null){
+            httpRespMsg.setError("请填写完整信息");
+            return httpRespMsg;
+        }
         //根据电话号码获取账号信息
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("phone", username));
         if (userList.size() == 0) {
@@ -44,7 +48,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else if (userList.size() > 1) {
             //检索到两个及以上账号时
             httpRespMsg.setError("账号重名");
-        } else if (userList.get(0).getRole().equals(1)) {
+        } else if (!userList.get(0).getRole().equals(1)) {
             //检索的账号role不是1 即不是管理员时
             httpRespMsg.setError("非管理员不能登陆系统");
         } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {