From 5754edafdf95958a7e7c12f67527f3f3743790d8 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Thu, 2 Aug 2018 16:35:04 +0800
Subject: [PATCH] fix bug

---
 .../tamguo/modules/sys/service/ISysUserService.java |  4 +---
 .../sys/service/impl/SysUserServiceImpl.java        | 13 +++++++++----
 .../com/tamguo/modules/sys/web/LoginController.java | 10 ++++------
 .../main/resources/static/modules/sys/sysLogin.js   |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
index 91e3f0d..e080ee4 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
@@ -1,8 +1,6 @@
 package com.tamguo.modules.sys.service;
 
 import java.util.List;
-import java.util.Set;
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.tamguo.modules.sys.model.SysMenuEntity;
@@ -62,5 +60,5 @@ public interface ISysUserService extends IService<SysUserEntity>{
 	public void updateAdmin(SysUserEntity user);
 
 	/** 当前用户权限菜单*/
-	public Set<SysMenuEntity> findUserMenuList();
+	public List<SysMenuEntity> findUserMenuList();
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
index 3d10fe4..37444c6 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.tamguo.modules.sys.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -288,19 +289,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Set<SysMenuEntity> findUserMenuList() {
+	public List<SysMenuEntity> findUserMenuList() {
 		String userCode = ShiroUtils.getUserCode();
 		if(SystemConstant.SYSTEM_USER_CODE.equals(userCode)) {
 			List<SysMenuEntity> menus = sysMenuMapper.selectList(Condition.create().orderAsc(java.util.Arrays.asList("tree_sort")));
-			return new HashSet<>(menus);
+			return (menus);
 		}
-		Set<SysMenuEntity> menus = new HashSet<>();
+		List<SysMenuEntity> menus = new ArrayList<>();
+		Set<String> menuIds = new HashSet<>();
 		List<SysUserRoleEntity> userRoleList = sysUserRoleMapper.selectList(Condition.create().eq("user_code", userCode));
 		for(SysUserRoleEntity userRole : userRoleList) {
 			List<SysRoleMenuEntity> roleMenuList = sysRoleMenuMapper.selectList(Condition.create().eq("role_code", userRole.getRoleCode()));
 			for(SysRoleMenuEntity roleMenu : roleMenuList) {
 				SysMenuEntity menu = sysMenuMapper.selectById(roleMenu.getMenuCode());
-				menus.add(menu);
+				if(!menuIds.contains(menu.getMenuCode())) {
+					menus.add(menu);
+				}
+				menuIds.add(menu.getMenuCode());
 			}
 		}
 		return menus;
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
index 3cb130a..2fd81b9 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/LoginController.java
@@ -1,7 +1,6 @@
 package com.tamguo.modules.sys.web;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.shiro.authc.AuthenticationException;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.tamguo.modules.sys.service.ISysUserService;
-import com.tamguo.modules.sys.utils.ExceptionSupport;
 import com.tamguo.modules.sys.utils.Result;
 import com.tamguo.modules.sys.utils.ShiroUtils;
 import com.tamguo.modules.sys.utils.TamguoConstant;
@@ -57,13 +55,13 @@ public class LoginController {
 			request.getSession().setAttribute("userMenuList", iSysUserService.findUserMenuList());
 			request.getSession().setAttribute("currAdmin", ShiroUtils.getUser());
 		} catch (UnknownAccountException e) {
-			return ExceptionSupport.resolverResult("找不到账户", this.getClass(), e);
+			return Result.result(501, null, "找不到账户");
 		} catch (IncorrectCredentialsException e) {
-			return ExceptionSupport.resolverResult("账户验证失败", this.getClass(), e);
+			return Result.result(502, null, "账户验证失败");
 		} catch (LockedAccountException e) {
-			return ExceptionSupport.resolverResult("账户验证失败", this.getClass(), e);
+			return Result.result(503, null, "账户验证失败");
 		} catch (AuthenticationException e) {
-			return ExceptionSupport.resolverResult("账户验证失败", this.getClass(), e);
+			return Result.result(504, null, "账户验证失败");
 		}
 		request.getSession().setAttribute("currAdmin", ShiroUtils.getUser());
 		return Result.successResult(username);
diff --git a/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js b/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js
index 6b8a204..0151803 100644
--- a/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js
+++ b/tamguo-oms/src/main/resources/static/modules/sys/sysLogin.js
@@ -13,7 +13,7 @@ $("#loginForm").validate({
           , a = $("#password").val()
           , b = $("#validCode").val();
         js.ajaxSubmitForm($(c), function(f, e, g) {
-            if (f.result.code != 0) {
+            if (f.code == 0) {
                 js.loading($("#btnSubmit").data("loading"));
                 location = ctx + "index"
             } else {