手机首页bug

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

src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -73,7 +73,7 @@ public class SaleApCheckController {
 	public List<ErpProdIODetail> getAllApChecks() {
 		List<Long> distributes = null;
 		// 判断当前用户是否被客户分配
-		if (!userService.IsNotadmin()) {
+		if (!SystemSession.getUser().isSys()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
 			distributes = new ArrayList<Long>();
 			if (!CollectionUtils.isEmpty(vendors)) {
@@ -179,7 +179,7 @@ public class SaleApCheckController {
 	public ModelAndView export() {
 		List<Long> distributes = null;
 		// 判断当前用户是否被客户分配
-		if (!userService.IsNotadmin()) {
+		if (!SystemSession.getUser().isSys()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
 			distributes = new ArrayList<Long>();
 			if (!CollectionUtils.isEmpty(vendors)) {

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -214,12 +214,6 @@ public interface UserService {
 	 */
 	public boolean removeChooseVendor(Long userUU,List<Long> ids);
 	
-	/**
-	 * 判断当前登录用户是否是管理员
-	 * @return
-	 */
-	public boolean IsNotadmin();
-	
 	/**
 	 * 查询当前客户是否有客户分配，返回分配客户的UU号
 	 * @return

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -25,7 +25,6 @@ import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.manage.model.AccountInfo;
 import com.uas.platform.b2b.model.Distribute;
 import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Role;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.UserInfo;
@@ -130,8 +129,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public List<User> findAll() {
-		return userDao.findByEnUU(SystemSession.getUser().getEnterprise()
-				.getUu());
+		return userDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 	}
 
 	@Override
@@ -139,15 +137,13 @@ public class UserServiceImpl implements UserService {
 		User newUser = userDao.findOne(user.getUserUU());
 		if (newUser != null) {
 			if (!newUser.getUserTel().equals(user.getUserTel().trim())) {// 修改了用户手机号
-				List<User> users = userDao.findUserByUserTel(user.getUserTel()
-						.trim());
+				List<User> users = userDao.findUserByUserTel(user.getUserTel().trim());
 				if (users.size() > 0) {
 					throw new IllegalOperatorException("电话号码重复，建议输入您自己的手机号");
 				}
 			}
 			if (!newUser.getUserEmail().equals(user.getUserEmail().trim())) {// 修改了用户邮箱地址
-				List<User> users = userDao.findUserByUserEmail(user
-						.getUserEmail().trim());
+				List<User> users = userDao.findUserByUserEmail(user.getUserEmail().trim());
 				if (users.size() > 0) {
 					throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 				}
@@ -163,16 +159,14 @@ public class UserServiceImpl implements UserService {
 				newUser.setRoles(user.getRoles());
 			}
 			try {
-				if (newUser.getEnterprise() == null
-						|| sendUserToManage(newUser)) {
+				if (newUser.getEnterprise() == null || sendUserToManage(newUser)) {
 					newUser = userDao.save(newUser);
 				}
 			} catch (Exception e) {
 				throw new RuntimeException(e.getMessage());
 			}
 			if (SystemSession.getUser().getUserUU().equals(newUser.getUserUU())) {
-				newUser.setCurrentEnterprise(SystemSession.getUser()
-						.getEnterprise().getUu());
+				newUser.setCurrentEnterprise(SystemSession.getUser().getEnterprise().getUu());
 				SystemSession.setUser(newUser);
 			}
 			return newUser;
@@ -183,8 +177,7 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User updatePassword(User user, String password, String newPassword) {
-		boolean result = user.getUserPwd().equals(
-				Md5Utils.encode(password, user.getUserUU()));
+		boolean result = user.getUserPwd().equals(Md5Utils.encode(password, user.getUserUU()));
 		if (result) {
 			User user1 = userDao.findOne(user.getUserUU());
 			user1.setUserPwd(Md5Utils.encode(newPassword, user1.getUserUU()));
@@ -211,17 +204,14 @@ public class UserServiceImpl implements UserService {
 	private static boolean sendUserToManage(User newUserInfo) throws Exception {
 		Map<String, String> params = new HashMap<String, String>();
 		params.put("data", FlexJsonUtils.toJson(new AccountInfo(newUserInfo)));
-		Response response = HttpUtil.sendPostRequest(HostConstant.MANAGE_HOST
-				+ "public/account", params, true);
+		Response response = HttpUtil.sendPostRequest(HostConstant.MANAGE_HOST + "public/account", params, true);
 		if (response.getStatusCode() == HttpStatus.OK.value()) {
-			List<Map<String, Object>> resultMap = FlexJsonUtils.fromJsonArray(
-					response.getResponseText(), HashMap.class);
+			List<Map<String, Object>> resultMap = FlexJsonUtils.fromJsonArray(response.getResponseText(), HashMap.class);
 			if (resultMap.size() > 0) {
 				if ("true".equals(String.valueOf(resultMap.get(0).get("ok")))) {
 					return true;
 				}
-				throw new Exception(String.valueOf(resultMap.get(0)
-						.get("error")));
+				throw new Exception(String.valueOf(resultMap.get(0).get("error")));
 			}
 		}
 		throw new Exception(response.getResponseText());
@@ -233,8 +223,7 @@ public class UserServiceImpl implements UserService {
 		if (users.size() > 0) {
 			throw new IllegalOperatorException("电话号码重复，建议输入您自己的手机号");
 		}
-		List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail()
-				.trim());
+		List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail().trim());
 		if (users2.size() > 0) {
 			throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 		}
@@ -262,8 +251,7 @@ public class UserServiceImpl implements UserService {
 		model.put("dateTime", timeFormat.format(new Date()));
 		model.put("userTel", user.getUserTel());
 		model.put("rootpath", AgentUtils.getHost(request));
-		sendMailService.sendTemplateMail(user.getUserEmail(), "欢迎使用UAS商务平台",
-				model, "velocity/newUser.vm");
+		sendMailService.sendTemplateMail(user.getUserEmail(), "欢迎使用UAS商务平台", model, "velocity/newUser.vm");
 		return user;
 	}
 
@@ -271,8 +259,7 @@ public class UserServiceImpl implements UserService {
 	public void removeUser(Long uu) {
 		User user = userDao.findOne(uu);
 		if (user != null) {
-			if (user.getEnterprises().contains(
-					SystemSession.getUser().getEnterprise())) {
+			if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
 				user.removeEnterprise(SystemSession.getUser().getEnterprise());
 				if (user.getEnterprises().size() == 0)
 					user.setEnable((short) Status.DISABLED.value());
@@ -305,17 +292,16 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public User addUser(User user, HttpServletRequest request,Enterprise enter) {
+	public User addUser(User user, HttpServletRequest request, Enterprise enter) {
 		List<User> users = userDao.findUserByUserTel(user.getUserTel().trim());
 		if (users.size() > 0) {
 			throw new IllegalOperatorException("电话号码重复，建议输入您自己的手机号");
 		}
-		List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail()
-				.trim());
+		List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail().trim());
 		if (users2.size() > 0) {
 			throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 		}
-		if(enter != null) {
+		if (enter != null) {
 			user.addEnterprise(enter);
 		}
 		user.setCurrentEnterprise();
@@ -334,15 +320,15 @@ public class UserServiceImpl implements UserService {
 		model.put("userName", user.getUserName());
 		model.put("userUU", user.getUserUU());
 		model.put("userEmail", user.getUserEmail());
-		model.put("enName",enter.getEnName());
+		model.put("enName", enter.getEnName());
 		SimpleDateFormat timeFormat = new SimpleDateFormat("MM月dd日 HH:mm:ss");
 		model.put("dateTime", timeFormat.format(new Date()));
 		model.put("userTel", user.getUserTel());
 		model.put("rootpath", AgentUtils.getHost(request));
-		sendMailService.sendTemplateMail(user.getUserEmail(), "欢迎使用UAS商务平台",
-				model, "velocity/changeAdmin.vm");
+		sendMailService.sendTemplateMail(user.getUserEmail(), "欢迎使用UAS商务平台", model, "velocity/changeAdmin.vm");
 		return user;
 	}
+
 	@Override
 	public User findShieldUuserInfo(String userName) {
 		User user = null;
@@ -362,12 +348,10 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public void sendForgetEmai(Long userUU, String type,
-			HttpServletRequest request) {
+	public void sendForgetEmai(Long userUU, String type, HttpServletRequest request) {
 		User user = userDao.findOne(userUU);
 		user.setCurrentEnterprise();
-		String encodeString = tokenService.getEncodeToken("user",
-				user.getUserUU());
+		String encodeString = tokenService.getEncodeToken("user", user.getUserUU());
 		// 发送邮件
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("enName", user.getEnterprise().getEnName());
@@ -379,13 +363,11 @@ public class UserServiceImpl implements UserService {
 			User admin = userDao.findOne(user.getEnterprise().getEnAdminuu());
 			// 发送邮件
 			model.put("email", admin.getUserEmail());
-			sendMailService.sendTemplateMail(admin.getUserEmail(),
-					"UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
 		} else {// 发送给自己
 			// 发送邮件
 			model.put("email", user.getUserEmail());
-			sendMailService.sendTemplateMail(user.getUserEmail(),
-					"UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
+			sendMailService.sendTemplateMail(user.getUserEmail(), "UAS商务平台找回密码", model, "velocity/forgetPwd.vm");
 		}
 	}
 
@@ -402,10 +384,8 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public void resetPwdByCheckcode(Long userUU, String newPwd, String checkcode) {
-		if (StringUtils.hasText(newPwd) && StringUtils.hasText(checkcode)
-				&& userUU != null) {
-			boolean result = tokenService
-					.isCertified("user", userUU, checkcode);
+		if (StringUtils.hasText(newPwd) && StringUtils.hasText(checkcode) && userUU != null) {
+			boolean result = tokenService.isCertified("user", userUU, checkcode);
 			if (result) {
 				User user = userDao.findOne(userUU);
 				if (user != null) {
@@ -414,8 +394,7 @@ public class UserServiceImpl implements UserService {
 					if (user.getEnterprise() == null)
 						user.setCurrentEnterprise();
 					try {
-						if (user.getEnterprise() == null
-								|| sendUserToManage(user)) {
+						if (user.getEnterprise() == null || sendUserToManage(user)) {
 							userDao.save(user);
 						}
 					} catch (Exception e) {
@@ -462,9 +441,9 @@ public class UserServiceImpl implements UserService {
 		user.setEnterprises(enterprises);
 		userDao.save(user);
 	}
-	
+
 	@Override
-	public void bindUserToMyEnterprise(Long userUU,Enterprise enter) {
+	public void bindUserToMyEnterprise(Long userUU, Enterprise enter) {
 		User user = userDao.findOne(userUU);
 		if (user == null)
 			throw new IllegalArgumentException("不存在的用户！");
@@ -473,7 +452,7 @@ public class UserServiceImpl implements UserService {
 		if (CollectionUtils.isEmpty(enterprises)) {
 			enterprises = new HashSet<Enterprise>();
 		}
-		if(enter != null) {
+		if (enter != null) {
 			enterprises.add(enter);
 		}
 		user.setEnterprises(enterprises);
@@ -483,9 +462,9 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public User isTelEffective(String tel) {
 		List<User> users = userDao.findUserByUserTel(tel);
-		if(users.size() > 0) {
+		if (users.size() > 0) {
 			return users.get(0);
-		}else {
+		} else {
 			return null;
 		}
 	}
@@ -493,11 +472,11 @@ public class UserServiceImpl implements UserService {
 	@Override
 	public List<Vendor> findVendorToUser(Long userUU) {
 		List<Vendor> vendors = vendorDao.findByVendEnUU(SystemSession.getUser().getEnterprise().getUu());
-		List<Distribute> distributes= distributeDao.findByUserUU(userUU);
-		if(!CollectionUtils.isEmpty(distributes) && !CollectionUtils.isEmpty(vendors)) {
-			for(Distribute d : distributes) {
-				for(int i=0;i<vendors.size(); i++) {
-					if(d.getVendorId().equals(vendors.get(i).getId()) ) {
+		List<Distribute> distributes = distributeDao.findByUserUU(userUU);
+		if (!CollectionUtils.isEmpty(distributes) && !CollectionUtils.isEmpty(vendors)) {
+			for (Distribute d : distributes) {
+				for (int i = 0; i < vendors.size(); i++) {
+					if (d.getVendorId().equals(vendors.get(i).getId())) {
 						vendors.get(i).setDistribute(true);
 					}
 				}
@@ -508,19 +487,19 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public boolean addVendorToUser(Long userUU, List<Vendor> vendors) {
-		if(!CollectionUtils.isEmpty(vendors)) {
-			for(Vendor vendor : vendors) {
+		if (!CollectionUtils.isEmpty(vendors)) {
+			for (Vendor vendor : vendors) {
 				Distribute disbute = new Distribute();
 				if (vendor.getDistribute()) {
 					List<Distribute> disbutes = distributeDao.findByUserUUAndVendorId(userUU, vendor.getId());
-					if(CollectionUtils.isEmpty(disbutes) ) {
+					if (CollectionUtils.isEmpty(disbutes)) {
 						disbute.setUserUU(userUU);
 						disbute.setVendorId(vendor.getId());
 						distributeDao.save(disbute);
 					}
 				} else {
 					List<Distribute> disbutes = distributeDao.findByUserUUAndVendorId(userUU, vendor.getId());
-					if(!CollectionUtils.isEmpty(disbutes)) {
+					if (!CollectionUtils.isEmpty(disbutes)) {
 						distributeDao.delete(disbutes.get(0));
 					}
 				}
@@ -534,11 +513,11 @@ public class UserServiceImpl implements UserService {
 	public List<Vendor> findChooseVendor(Long userUU) {
 		List<Vendor> vendors = vendorDao.findByVendEnUU(SystemSession.getUser().getEnterprise().getUu());
 		List<Vendor> vendors2 = new ArrayList<Vendor>();
-		List<Distribute> distributes= distributeDao.findByUserUU(userUU);
-		if(!CollectionUtils.isEmpty(distributes) && !CollectionUtils.isEmpty(vendors)) {
-			for(Distribute d : distributes) {
-				for(int i=0;i<vendors.size(); i++) {
-					if(d.getVendorId().equals(vendors.get(i).getId()) ) {
+		List<Distribute> distributes = distributeDao.findByUserUU(userUU);
+		if (!CollectionUtils.isEmpty(distributes) && !CollectionUtils.isEmpty(vendors)) {
+			for (Distribute d : distributes) {
+				for (int i = 0; i < vendors.size(); i++) {
+					if (d.getVendorId().equals(vendors.get(i).getId())) {
 						vendors2.add(vendors.get(i));
 					}
 				}
@@ -549,10 +528,10 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public boolean removeChooseVendor(Long userUU, List<Long> ids) {
-		if(!CollectionUtils.isEmpty(ids)) {
-			for(Long id : ids) {
+		if (!CollectionUtils.isEmpty(ids)) {
+			for (Long id : ids) {
 				List<Distribute> disbutes = distributeDao.findByUserUUAndVendorId(userUU, id);
-				if(!CollectionUtils.isEmpty(disbutes)) {
+				if (!CollectionUtils.isEmpty(disbutes)) {
 					distributeDao.delete(disbutes.get(0).getId());
 				}
 			}
@@ -561,32 +540,19 @@ public class UserServiceImpl implements UserService {
 		return false;
 	}
 
-	@Override
-	public boolean IsNotadmin() {
-		User currentUser = SystemSession.getUser();
-		if (!CollectionUtils.isEmpty(currentUser.getRoles())) {
-			for (Role r : currentUser.getRoles()) {
-				if (r.getIssys() == 1) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	@Override
 	public SearchFilter distribute() {
-		SearchFilter filter = null;;
-		if (!IsNotadmin()) {
+		SearchFilter filter = null;
+		if (!SystemSession.getUser().isSys()) {
 			List<Vendor> vendors = findChooseVendor(SystemSession.getUser().getUserUU());
 			List<Long> distributes = new ArrayList<Long>();
 			filter = new SearchFilter();
-			if(!CollectionUtils.isEmpty(vendors)) {
-				for(Vendor v : vendors) {
+			if (!CollectionUtils.isEmpty(vendors)) {
+				for (Vendor v : vendors) {
 					distributes.add(v.getMyEnUU());
 				}
 				filter.setDistribute(distributes);
-			} 
+			}
 		}
 		return filter;
 	}
@@ -604,11 +570,11 @@ public class UserServiceImpl implements UserService {
 	public List<User> findUserInfoDistribute(Long enUu) {
 		List<Distribute> butes = vendorService.findUserInfo(enUu);
 		List<User> users = userDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
-		if(!CollectionUtils.isEmpty(users)) {
-			if(!CollectionUtils.isEmpty(butes)) {
-				for(User u : users) {
-					for(Distribute d : butes) {
-						if(u.getUserUU().equals(d.getUserUU())) {
+		if (!CollectionUtils.isEmpty(users)) {
+			if (!CollectionUtils.isEmpty(butes)) {
+				for (User u : users) {
+					for (Distribute d : butes) {
+						if (u.getUserUU().equals(d.getUserUU())) {
 							u.setDistribute(true);
 						}
 					}
@@ -621,19 +587,19 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public boolean addUserToVendor(Long custUU, List<User> users) {
-		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU,SystemSession.getUser().getEnterprise().getUu());
-		if(!CollectionUtils.isEmpty(users)) {
-			for(User u : users) {
+		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU, SystemSession.getUser().getEnterprise().getUu());
+		if (!CollectionUtils.isEmpty(users)) {
+			for (User u : users) {
 				Distribute disbute = new Distribute();
 				List<Distribute> butes = distributeDao.findByUserUUAndVendorId(u.getUserUU(), vendors.get(0).getId());
-				if(u.getDistribute()) {
-					if(CollectionUtils.isEmpty(butes)) {
+				if (u.getDistribute()) {
+					if (CollectionUtils.isEmpty(butes)) {
 						disbute.setUserUU(u.getUserUU());
 						disbute.setVendorId(vendors.get(0).getId());
 						distributeDao.save(disbute);
 					}
 				} else {
-					if(!CollectionUtils.isEmpty(butes)) {
+					if (!CollectionUtils.isEmpty(butes)) {
 						distributeDao.delete(butes.get(0));
 					}
 				}

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

@@ -254,8 +254,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				}
 			}
 			$scope.userInfo = data;
-			if (data == null || !data.uu)
+			if (data == null || !data.userUU) {
 				$scope.isAuthed = false;
+				window.location.pathname += 'signin';
+			}
 		});
 		$scope.logout = function() {
 			AuthenticationService.logout().success(function() {