feat：bug修改

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/auth/AuthRequestUtil.java

 package com.gic.haoban.manage.web.auth;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.manage.api.dto.LoginDTO;
 import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -21,6 +23,7 @@ import java.util.concurrent.TimeUnit;
  *
  * @author hua
  */
+@Deprecated
 public class AuthRequestUtil {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthRequestUtil.class);
@@ -33,7 +36,7 @@ public class AuthRequestUtil {
         String userJson = JSON.toJSONString(obj);
         getSession().setAttribute(LOGIN_SESSION_KEY, userJson);
     }
-    
+
     public static void delSessionUser() {
         getSession().removeAttribute(LOGIN_SESSION_KEY);
     }
@@ -43,8 +46,8 @@ public class AuthRequestUtil {
         if (StringUtils.isBlank(token)) {
             return null;
         }
-        Object cache = RedisUtil.getCache(token);
-        return cache;
+        //为了做兼容
+        return EntityUtil.changeEntityByJSON(LoginDTO.class, RedisUtil.getCache(token));
     }
 
     private static void setLoginUserLastToken(String token, Object obj) {
@@ -104,16 +107,18 @@ public class AuthRequestUtil {
         RedisUtil.delCache(token);
     }
 
-    public static void setAppLoginUser(Object obj,String token) {
+    public static void setAppLoginUser(Object obj, String token) {
         RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
         getResponse().setHeader("token", token);
         //setLoginUserLastToken(token, obj);
     }
+
     public static void setAppFakeLoginUser(Object obj) {
         String token = getRequest().getHeader("token");
         RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
         getResponse().setHeader("token", token);
     }
+
     public static HttpSession getSession() {
         HttpSession session = null;
         try {
@@ -135,16 +140,16 @@ public class AuthRequestUtil {
         return attrs.getResponse();
     }
 
-	public static Object getLoginUser() {
-		Cookie[] cookies = AuthRequestUtil.getRequest().getCookies();
-		String token = "";
-		if(cookies != null){
-			for (Cookie cookie : cookies) {
-				if(cookie.getName().equals("token")){
-					token = cookie.getValue();
-				}
-			}
-		}
-		return getAppLoginUser(token);
-	}
+    public static Object getLoginUser() {
+        Cookie[] cookies = AuthRequestUtil.getRequest().getCookies();
+        String token = "";
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (cookie.getName().equals("token")) {
+                    token = cookie.getValue();
+                }
+            }
+        }
+        return getAppLoginUser(token);
+    }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java

 package com.gic.haoban.manage.web.controller;
 
 import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.LoginDTO;
-import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import org.apache.commons.collections.CollectionUtils;
 
@@ -35,14 +36,14 @@ public class WebBaseController {
     public HaobanResponse resultResponse(HaoBanErrCode errCode) {
         return resultResponse(errCode, null, null);
     }
-    public HaobanResponse resultResponse(HaoBanErrCode errCode, String message,Object data,String detailError) {
+
+    public HaobanResponse resultResponse(HaoBanErrCode errCode, String message, Object data, String detailError) {
         HaobanResponse response = new HaobanResponse();
         response.setMessage(message);
         response.setDetailError(detailError);
         response.setErrorCode(errCode.getCode());
         return response;
     }
-    
 
     /**
      * 获取登陆信息
@@ -50,31 +51,29 @@ public class WebBaseController {
      * @return
      */
     protected LoginDTO getLoginUser() {
-        LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
-        return login;
+        //为了做兼容
+        Object loginUser = AuthWebRequestUtil.getLoginUser();
+        return EntityUtil.changeEntityByJSON(LoginDTO.class, loginUser);
     }
 
-    public boolean haveRight(List<DisplayRelationShortInfoDTO> list){
-    	List<String> groupList = new ArrayList<String>();
-    	List<String> storeList = new ArrayList<String>();
-    	List<String> clerkList = new ArrayList<String>();
-    	if(list==null){
-    		return false;
-    	}
-        for(DisplayRelationShortInfoDTO showDto :list){
-        	if(showDto.getGroupId()!=null){
-        		groupList.add(showDto.getGroupId());
-        	}
-        	if(showDto.getStoreId()!=null){
-        		storeList.add(showDto.getStoreId());
-        	}
-        	if(showDto.getClerkId()!=null){
-        		clerkList.add(showDto.getClerkId());
-        	}
+    public boolean haveRight(List<DisplayRelationShortInfoDTO> list) {
+        List<String> groupList = new ArrayList<String>();
+        List<String> storeList = new ArrayList<String>();
+        List<String> clerkList = new ArrayList<String>();
+        if (list == null) {
+            return false;
         }
-        if(CollectionUtils.isEmpty(groupList) && CollectionUtils.isEmpty(storeList) && CollectionUtils.isEmpty(clerkList)){
-        	return false;
+        for (DisplayRelationShortInfoDTO showDto : list) {
+            if (showDto.getGroupId() != null) {
+                groupList.add(showDto.getGroupId());
+            }
+            if (showDto.getStoreId() != null) {
+                storeList.add(showDto.getStoreId());
+            }
+            if (showDto.getClerkId() != null) {
+                clerkList.add(showDto.getClerkId());
+            }
         }
-        return true;
+        return !CollectionUtils.isEmpty(groupList) || !CollectionUtils.isEmpty(storeList) || !CollectionUtils.isEmpty(clerkList);
     }
 }