账户管理-密保问题调整

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -527,13 +527,8 @@ public class UserController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getUserQuestion", method = RequestMethod.GET)
-	public List<UserQuestion> getUserQuestion() {
-		User sysUser = SystemSession.getUser();
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json; charset=utf-8");
-		List<UserQuestion> questions = uqService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
-		Map<String, List<UserQuestion>> result = new HashMap<String, List<UserQuestion>>();
-		result.put("questions", questions);
+	public List<UserQuestion> getUserQuestion(Long userUU) {
+		List<UserQuestion> questions = uqService.findUserQuestionByUserUUOrderBySortAsc(userUU);
 		return questions;
 	}
 

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserQuestionServiceImpl.java

@@ -1,20 +1,25 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
 import com.uas.account.util.AccountUtils;
+import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserQuestionDao;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserQuestion;
 import com.uas.platform.b2c.common.account.service.UserQuestionService;
+import com.uas.platform.core.exception.IllegalOperatorException;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class UserQuestionServiceImpl implements UserQuestionService {
 
     @Autowired
     private UserQuestionDao userQuestionDao;
 
+    @Autowired
+    private UserDao userDao;
+
     @Override
     public UserQuestion save(UserQuestion userQuestion){
         postToAccountCenter(userQuestion);
@@ -23,7 +28,11 @@ public class UserQuestionServiceImpl implements UserQuestionService {
 
     @Override
     public List<UserQuestion> findUserQuestionByUserUUOrderBySortAsc(Long userUU) {
-        return userQuestionDao.findUserQuestionByUserUUOrderBySortAsc(userUU);
+        User user = userDao.findOne(userUU);
+        if (user == null) {
+            throw new IllegalOperatorException("找不到用户...");
+        }
+        return userQuestionDao.findUserQuestionByUserUUOrderBySortAsc(user.getUserUU());
     }
 
     private void postToAccountCenter(UserQuestion question) {

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -1363,7 +1363,7 @@ define(['app/app'], function (app) {
           User.getAllSecQuestion($scope.pageInfo, function (data) {
             $scope.secQuestions = data.content;
             //查询当前用户密保问题
-            User.getUserQuestion(function (data) {
+            User.getUserQuestion({userUU: $scope.userInfo.userUU},function (data) {
               $scope.uq[0] = data[0];
               $scope.uq[1] = data[1];
             });

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -1302,7 +1302,7 @@ define(['app/app'], function(app) {
           User.getAllSecQuestion($scope.pageInfo, function (data) {
             $scope.secQuestions = data.content;
             //查询当前用户密保问题
-            User.getUserQuestion(function (data) {
+            User.getUserQuestion({userUU: $scope.userInfo.userUU},function (data) {
               $scope.uq[0] = data[0];
               $scope.uq[1] = data[1];
             });