Просмотр исходного кода

更换管理员小细节修复

wangmh 8 лет назад
Родитель
Сommit
bbf8d5d19b

+ 3 - 2
sso-server/src/main/java/com/uas/sso/controller/ChangeAdminController.java

@@ -6,6 +6,7 @@ import com.uas.sso.service.ChangeAdminService;
 import com.uas.sso.service.UserService;
 import com.uas.sso.service.UserspaceService;
 import com.uas.sso.support.SystemSession;
+import com.uas.sso.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
@@ -60,7 +61,7 @@ public class ChangeAdminController extends BaseController {
         ModelMap data = new ModelMap();
         data.put("mobile", Status.AUTHENTICATED.getCode() == user.getMobileValidCode() ? user.getMobile() : null);
         data.put("email", Status.AUTHENTICATED.getCode() == user.getEmailValidCode() ? user.getEmail() : null);
-        data.put("questions", user.getQuestions());
+        data.put("questions", !CollectionUtils.isEmpty(user.getQuestions()) ? user.getQuestions() : null);
         request.getSession().setAttribute("user", user);
         return success(data);
     }
@@ -160,7 +161,7 @@ public class ChangeAdminController extends BaseController {
         }
         request.getSession().setAttribute("answers", userAnswer);
         ModelMap data = new ModelMap();
-        data.put("question", questions);
+        data.put("questions", questions);
         return success(data);
     }