Browse Source

默认账户权限bug修复

zhaohongpeng 8 years ago
parent
commit
c7ad3c2191

+ 0 - 1
src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -435,7 +435,6 @@ public class UserServiceImpl implements UserService {
 		detail.setMobile(user.getUserTel());
 		detail.setName(user.getUserName());
 		detail.setSex(user.getUserSex());
-
 		List<com.uas.account.entity.User> users = AccountUtils.addUser(user.getUserUU(), SystemSession.getUser().getEnterprise().getUu(), detail, password);
 		if (!CollectionUtils.isEmpty(users)) {
 			return users.get(0);

+ 3 - 0
src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -170,6 +170,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
      * 权限验证
      */
     private void accessDecision(HttpServletRequest request, User user) {
+        //判断当前访问是否有权限限制
         Collection<ConfigAttribute> configAttributes = getAttributes(request);
         if (null == configAttributes || configAttributes.size() == 0 || user.isSys()) {
             return;
@@ -179,7 +180,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         if (null == authorities || !authorities.containsKey(user.getUserUU())) {
             setGrantedAuthorities(user);
         }
+        //获取当前登录用户的所有权限;
         Collection<GrantedAuthority> userAuthorities = authorities.get(user.getUserUU());
+        //匹配当前访问权限;
         while (iterator.hasNext()) {
             ConfigAttribute configAttribute = iterator.next();
             needPermission = configAttribute.getAttribute();

+ 5 - 0
src/main/java/com/uas/platform/b2c/fa/payment/controller/BankInfoController.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.fa.payment.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.common.account.model.Role;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.base.model.FileUpload;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -20,6 +22,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * The type BankInfo controller.
@@ -191,6 +194,8 @@ public class BankInfoController {
 	@RequestMapping(value="/setDefaultAccount/{id}", method = RequestMethod.GET)
 	@ApiOperation(value = "设置默认银行账户", httpMethod = "GET")
 	public void setDefaultAccount(@ApiParam(required = true, value = "账户id") @PathVariable("id") Long id) {
+		User user = SystemSession.getUser();
+		Set<Role> roles = user.getRoles();
 		logger.log("银行账户信息", "设置默认账户", "将id为"+ id +"的账户信息设置成默认账户,操作人UU号是:"+ SystemSession.getUser().getUserUU());
 		bankInfoService.setDefaultAccount(id);
 	}

+ 2 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -253,7 +253,8 @@ define(['app/app'], function(app) {
 				toaster.pop('success', '设置成功');
 				loadAccountData();
 			}, function(response) {
-				toaster.pop('error', '设置默认账户失败');
+				// toaster.pop('error', '设置默认账户失败');
+                toaster.pop('error', response.data);
 			})
 		};