Merge remote-tracking branch 'origin/feature-wangcz-201814' into feature-wangcz-201814

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

@@ -1,10 +1,7 @@
 package com.uas.platform.b2c.common.account.service.impl;
 
 import com.uas.message.mail.service.MailService;
-import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
-import com.uas.platform.b2c.common.account.dao.RoleDao;
-import com.uas.platform.b2c.common.account.dao.UserCacheEnterpriseDao;
-import com.uas.platform.b2c.common.account.dao.UserDao;
+import com.uas.platform.b2c.common.account.dao.*;
 import com.uas.platform.b2c.common.account.model.*;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.common.base.dao.CommonDao;
@@ -75,6 +72,9 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private MessageConf messageConf;
 
+	@Autowired
+	private ResourceItemDao resourceItemDao;
+
 	@Override
 	public User findUserByUserUU(Long uu) {
 		List<User> users = userDao.findUserByUserUU(uu);
@@ -523,6 +523,7 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public ModelMap anthority(User user,String resUrl) {
 		Set<ResourceItem> resourceItems = new HashSet<>();
+		List<ResourceItem> resourceItemList = resourceItemDao.findAll();
 		user.setCurrentEnterpriseRoles();
 		Set<Role> roles = user.getRoles();
 		if (!org.apache.commons.collections.CollectionUtils.isEmpty(roles)) {
@@ -545,9 +546,19 @@ public class UserServiceImpl implements UserService {
 				}
 			}
 		}
+		if (!org.apache.commons.collections.CollectionUtils.isEmpty(resourceItemList)) {
+			for (ResourceItem re : resourceItemList) {
+				if (resUrl.equals(re.getUrl())) {
+					ModelMap map = new ModelMap();
+					map.put("status","fail");
+					map.put("msg","您没有 "+re.getDesc()+" 权限,请联系管理员");
+					return map;
+				}
+			}
+		}
 		ModelMap map = new ModelMap();
 		map.put("status","fail");
-		map.put("msg","没有该导出权限，请联系管理员");
+		map.put("msg","没有该权限，请联系管理员");
 		return map;
 	}
 }