git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@642 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/filter/SecurityInterceptor.java

@@ -138,7 +138,7 @@ public class SecurityInterceptor extends AbstractSecurityInterceptor implements
 				User authedUser = userService.findUserByUserUU(Long.parseLong(authentication.getName()));
 				authedUser.setCurrentEnterprise();
 				Set<Role> roles = authedUser.getRoles();
-				if (!CollectionUtils.isEmpty(roles)) {
+				if (!authedUser.isSys() && !CollectionUtils.isEmpty(roles)) {
 					for (Role role : roles) {
 						if (role.isSys()) {// 超级账号
 							authedUser.setIssys(Constant.YES);

src/main/webapp/WEB-INF/views/normal/index.html

@@ -199,24 +199,10 @@
 				<ul class="nav navbar-nav">
 					<li ng-class="{'active': routeState == 'home'}"><a
 						ui-sref="home">首页</a></li>
-					<li ng-class="{'active': routeState == 'user'}"><a
-						ui-sref="user">账户设置</a></li>
+					<li ng-class="{'active': routeState == 'account'}"><a
+						ui-sref="account">账户设置</a></li>
 					<li class="dropdown" ng-class="{'active': routeState == 'sale'}"><a
-						ui-sref="sale.index">销售管理</a> <!-- <ul class="dropdown-menu">
-							<li><a href="#">设置水印</a></li>
-							<li><a href="#">网店秀</a></li>
-							<li><a href="#">美图秀秀</a></li>
-							<li><a href="#">图片拍摄</a></li>
-							<li><a href="#">图片搬家</a></li>
-							<li class="dropdown-submenu"><a href="#"
-								class="dropdown-toggle">系统日志</a>
-								<ul class="dropdown-menu">
-									<li><a href="#">图片操作日志</a></li>
-									<li><a href="#">分类操作日志</a></li>
-									<li><a href="#">授权操作日志</a></li>
-									<li><a href="#">容量变更日志</a></li>
-								</ul></li>
-						</ul> --></li>
+						ui-sref="sale.index">销售管理</a></li>
 					<li ng-class="{'active': routeState == 'qc'}"><a ui-sref="qc">品质管理</a></li>
 					<li ng-class="{'active': routeState == 'fa'}"><a ui-sref="fa">财务对账</a></li>
 				</ul>

src/main/webapp/resources/js/index/app.js

@@ -400,6 +400,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
 					}
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '加载失败', response.data);
 				});
 			}
 		});
@@ -507,6 +510,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
 					}
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '加载失败', response.data);
 				});
 			}
 		});
@@ -579,6 +585,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
 					}
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '加载失败', response.data);
 				});
 			}
 		});
@@ -700,6 +709,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
 					}
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '加载失败', response.data);
 				});
 			}
 		});

src/main/webapp/resources/tpl/index/user/right.html

@@ -0,0 +1 @@
+<div ui-view class="user-view"></div>