From 17b703fb79897d9efa6e2d8acb3577d6046abc7f Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 3 Mar 2021 10:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  8 -------
 .../controller/UserInfoController.java        | 24 +++++++++----------
 .../liuwanr/service/UserInfoService.java      | 12 ++++++----
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6093093..5d82d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,14 +288,6 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
 	</build>
 
 
diff --git a/src/main/java/com/yipin/liuwanr/controller/UserInfoController.java b/src/main/java/com/yipin/liuwanr/controller/UserInfoController.java
index 8d97594..e46d4a3 100644
--- a/src/main/java/com/yipin/liuwanr/controller/UserInfoController.java
+++ b/src/main/java/com/yipin/liuwanr/controller/UserInfoController.java
@@ -349,21 +349,21 @@ public class UserInfoController {
             userInfo.setAccount(account);
             userInfo.setPassword(password);
             HashMap<String, Object> ret = userInfoService.adminLogins(userInfo);
-            UserInfo userInfo1 = (UserInfo)ret.get("retvalue");
-            String roleIds = userInfo1.getRoleId();
-
-            if(roleIds.equals(null) || roleIds.equals("")){
-                resp.setStatus(401);
-                resp.setErrmessage("无登录权限，请联系管理员处理！");
-                return resp;
-            }else{
-                List list = permissionService.getPermission(roleIds);
-                map.put("retvalue",ret.get("retvalue"));
-                map.put("listValue",list);
-            }
 
             int status = (int) ret.get("retcode");
             if (200 == status) {
+                UserInfo userInfo1 = (UserInfo)ret.get("retvalue");
+                String roleIds = userInfo1.getRoleId();
+
+                if(roleIds.equals(null) || roleIds.equals("")){
+                    resp.setStatus(401);
+                    resp.setErrmessage("无登录权限，请联系管理员处理！");
+                    return resp;
+                }else{
+                    List list = permissionService.getPermission(roleIds);
+                    map.put("retvalue",ret.get("retvalue"));
+                    map.put("listValue",list);
+                }
                 resp.setStatus(status);
                 //resp.setMessage(ret.get("retvalue"));
                 resp.setMessage(map);
diff --git a/src/main/java/com/yipin/liuwanr/service/UserInfoService.java b/src/main/java/com/yipin/liuwanr/service/UserInfoService.java
index 93d476a..f486acc 100644
--- a/src/main/java/com/yipin/liuwanr/service/UserInfoService.java
+++ b/src/main/java/com/yipin/liuwanr/service/UserInfoService.java
@@ -470,11 +470,13 @@ public class UserInfoService {
 		HashMap<String, Object> resp = new HashMap<String, Object>();
 		try {
 			UserInfo user=userInfoMapper.adminLogins(userInfo);
-			if (user.getRoleId().contains("1")){
-				user.setSchoolId(null);
-			}else {
-				Integer schoolId = staffMapper.querySchoolId(user.getUserId());
-				user.setSchoolId(schoolId);
+			if(user != null){
+				if (user.getRoleId().contains("1")){
+					user.setSchoolId(null);
+				}else {
+					Integer schoolId = staffMapper.querySchoolId(user.getUserId());
+					user.setSchoolId(schoolId);
+				}
 			}
 
 			if (user==null){