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

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,6 +349,9 @@ public class UserInfoController {
             userInfo.setAccount(account);
             userInfo.setPassword(password);
             HashMap<String, Object> ret = userInfoService.adminLogins(userInfo);
+
+            int status = (int) ret.get("retcode");
+            if (200 == status) {
                 UserInfo userInfo1 = (UserInfo)ret.get("retvalue");
                 String roleIds = userInfo1.getRoleId();
 
@@ -361,9 +364,6 @@ public class UserInfoController {
                     map.put("retvalue",ret.get("retvalue"));
                     map.put("listValue",list);
                 }
-
-            int status = (int) ret.get("retcode");
-            if (200 == status) {
                 resp.setStatus(status);
                 //resp.setMessage(ret.get("retvalue"));
                 resp.setMessage(map);

src/main/java/com/yipin/liuwanr/service/UserInfoService.java

@@ -470,12 +470,14 @@ public class UserInfoService {
 		HashMap<String, Object> resp = new HashMap<String, Object>();
 		try {
 			UserInfo user=userInfoMapper.adminLogins(userInfo);
+			if(user != null){
 				if (user.getRoleId().contains("1")){
 					user.setSchoolId(null);
 				}else {
 					Integer schoolId = staffMapper.querySchoolId(user.getUserId());
 					user.setSchoolId(schoolId);
 				}
+			}
 
 			if (user==null){
 				resp.put("retvalue","账号密码有误，请稍后再试！");