登录问题以及启动报错问题处理

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>
 
 

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);

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")){
+			if(user != null){
-				user.setSchoolId(null);
+				if (user.getRoleId().contains("1")){
-			}else {
+					user.setSchoolId(null);
-				Integer schoolId = staffMapper.querySchoolId(user.getUserId());
+				}else {
-				user.setSchoolId(schoolId);
+					Integer schoolId = staffMapper.querySchoolId(user.getUserId());
+					user.setSchoolId(schoolId);
+				}
 			}
 
 			if (user==null){