Browse Source

安全设置 bug处理

529010777@qq.com 8 years ago
parent
commit
5590b1d6c4

+ 4 - 2
src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -34,8 +34,10 @@ public class AuthenticationController {
 		if (SystemSession.getUser() == null) {
 			return null;
 		}
-		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(SystemSession.getUser().getUserUU());
-		User user = userService.findUserByUserUU(SystemSession.getUser().getUserUU());
+		User sysUser = SystemSession.getUser();
+		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
+		User user = userService.findUserByUserUU(sysUser.getUserUU());
+		user.setEnterprise(sysUser.getEnterprise());
 		UserInfo userInfo = new UserInfo(user);
 		if(userQuestion!=null){
 			if(userQuestion.size()>0){

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -20,7 +20,7 @@
                     <dd>
                        <span ng-cloak>{{userInfo.userName}} | <br/> <!--<em>账户余额:¥68899.99</em>--></span>
                         <span ng-cloak ng-bind="userInfo.enterprise.enName || '个人账户'"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
-                        <a href="user#/accountManager">账户设置&nbsp;》</a>
+                        <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                     </dd>
                 </dl>
             </div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -21,7 +21,7 @@
                 <dd>
                     <span>{{userInfo.userName}}  | <br/><!--<em>账户余额:¥68899.99</em>--></span>
                     <span ng-bind="vendor.enName || '个人账户'"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
-                    <a href="vendor#/account/management">账户设置&nbsp;》</a>
+                    <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务:******</p>-->
                 </dd>
             </dl>