新增导出权限修改

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -130,6 +130,7 @@ public class AuthenticationController {
 		String currUrl;
 		try {
 			currUrl = URLDecoder.decode(resUrl, "UTF-8");
+			currUrl = "/" + currUrl;
 		} catch (UnsupportedEncodingException e) {
 			throw new IllegalArgumentException("URL编码错误!");
 		}

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

@@ -33,22 +33,6 @@ public interface UserService {
 	 * @return
 	 */
 	User findUserPwdByUserUU(Long uu);
-	/**
-	 * 按企业及个人uu取用户信息
-	 * 
-	 * @param enUU
-	 * @param userUU
-	 * @return
-	 */
-	User findUserByEnUUAndUserUU(Long enUU, Long userUU);
-	
-	/**
-	 * 按企业uu取用户信息
-	 * 
-	 * @param enUU
-	 * @return
-	 */
-	List<User> findUsersByEnUU(Long enUU);
 
 	/**
 	 * 按企业uu分页取用户信息
@@ -57,7 +41,6 @@ public interface UserService {
 	 * @return
 	 */
 	Page<User> findUsersPageByEnUU(PageInfo pageInfo, Long enUU);
-	Page<User> findUsersPageByEnUUAndKeyword(PageInfo pageInfo , Long enUU , String keyword);
 
 	/**
 	 * 通过姓名获取该企业所有人员信息

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

@@ -66,9 +66,6 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
-	@Autowired
-	private CommonDao commonDao;
-
 	@Autowired
 	private UserCacheEnterpriseDao userCacheEnterpriseDao;
 
@@ -78,51 +75,6 @@ public class UserServiceImpl implements UserService {
 	@Autowired
 	private MessageConf messageConf;
 
-
-	@Override
-	public Page<User> findUsersPageByEnUUAndKeyword(final PageInfo pageInfo , Long enUU , String keyword) {
-		List<Long> usersId = new ArrayList<>();
-		if (keyword.contains("@")) { // 按邮箱查找
-			usersId = userDao.findUserByUserEmailAndEnUU(keyword, enUU);
-		} else if (keyword.matches(TEL_REGEXP)) { // 按手机号查找
-			usersId = userDao.findUserByUserTelAndEnUU(keyword, enUU);
-		} else if (keyword.matches(UU_REGEXP)) { // 按UU号查找
-			usersId = userDao.findUserByEnUUAndUserUU(enUU, Long.parseLong(keyword));
-		} else if (!keyword.contains("@") && (keyword.matches(CHINESE_REGEXP) || keyword.matches(ENGLISH_REGEXP))) {// 按名字查找
-			usersId = userDao.findUserByUserNameAndEnUU(keyword, enUU);
-		} else{
-			usersId = userDao.findUserByUserNameAndEnUU(keyword, enUU);
-		}
-		final List<Long> users = usersId;
-		if (users.size()>0) {
-			Page<User> pUser = userDao.findAll(new Specification<User>() {
-				public Predicate toPredicate(Root<User> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-					Predicate predicateId = root.get("userUU").in(users);
-					query.where(predicateId);
-					return null;
-				}
-			}, pageInfo);
-			for (User user : pUser) {
-				Set<Role> roles = user.getRoles();
-				Long enuu = SystemSession.getUser().getEnterprise().getUu();
-				if (!CollectionUtils.isEmpty(roles)) {
-					Iterator<Role> iterator = roles.iterator();
-					while (iterator.hasNext()) {
-						Role role = iterator.next();
-						if (!role.getEnUU().equals(enuu)) {
-							iterator.remove();
-						}
-					}
-				}
-			}
-			return pUser;
-		}else{
-			return null;
-		}
-
-	}
-
-
 	@Override
 	public User findUserByUserUU(Long uu) {
 		List<User> users = userDao.findUserByUserUU(uu);
@@ -184,18 +136,6 @@ public class UserServiceImpl implements UserService {
 		return users;
 	}
 
-	@Override
-	public User findUserByEnUUAndUserUU(Long enUU, Long userUU) {
-		List<User> users = userDao.findByEnUUAndUserUU(enUU, userUU);
-		return CollectionUtils.isEmpty(users) ? null : users.get(0);
-	}
-
-	@Override
-	public List<User> findUsersByEnUU(Long enUU) {
-		List<User> users = userDao.findByEnUU(enUU);
-		return users;
-	}
-
 	@Override
 	public Page<User> findUsersPageByEnUU(final PageInfo pageInfo , Long enUU) {
 		final List<Long> usersId = userDao.findIdByEnUU(enUU);
@@ -729,11 +669,6 @@ public class UserServiceImpl implements UserService {
 					map.put("status","sucess");
 					map.put("msg",re.getDesc());
 					return map;
-				} else {
-					ModelMap map = new ModelMap();
-					map.put("status","fail");
-					map.put("msg","没有该导出权限，请联系管理员");
-					return map;
 				}
 			}
 		}else {
@@ -742,6 +677,9 @@ public class UserServiceImpl implements UserService {
 			map.put("msg","没有该导出权限，请联系管理员");
 			return map;
 		}
-		return null;
+		ModelMap map = new ModelMap();
+		map.put("status","fail");
+		map.put("msg","没有该导出权限，请联系管理员");
+		return map;
 	}
 }