zhaohongpeng 7 лет назад
Родитель
Сommit
bdbb49989a

+ 5 - 0
src/main/java/com/uas/platform/b2c/common/account/service/ResourceService.java

@@ -1,11 +1,16 @@
 package com.uas.platform.b2c.common.account.service;
 
 import com.uas.platform.b2c.common.account.model.Resource;
+import com.uas.platform.b2c.trade.support.ResultMap;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 public interface ResourceService {
 
     public List<Resource> findAll();
 
+
+    ResultMap getAccessResources(HttpServletRequest request, String currUrl, String method);
+
 }

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

@@ -519,10 +519,10 @@ public class UserServiceImpl implements UserService {
 	public void removeUser(Long uu) {
 		User user = userDao.findOne(uu);
 		if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
-//			user.removeEnterprise(SystemSession.getUser().getEnterprise());
-//			if (user.getEnterprises().size() == 0)
-//				user.setEnable((short) Status.DISABLED.value());
-//			userDao.save(user);
+			user.removeEnterprise(SystemSession.getUser().getEnterprise());
+			/*if (user.getEnterprises().size() == 0)
+				user.setEnable((short) Status.DISABLED.value());*/
+			userDao.save(user);
 			try {
 				com.uas.sso.util.AccountUtils.removeUser(uu,SystemSession.getUser().getEnterprise().getUu());
 			} catch (Exception e) {

+ 1 - 1
src/main/webapp/resources/js/common/query/enterprise.js

@@ -186,7 +186,7 @@ define([ 'angular', 'ui-bootstrap', 'ngResource' ], function(angular) {
 				method : 'PUT'
 			},
 			updateEnterpriseInfo : {
-				url : 'basic/enterprise/:enuu/info',
+				url : 'basic/enterprise/:enuu/updateInfo',
 				method : 'POST'
 			},
 			//绑定界面的用户搜索