fix

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

@@ -30,13 +30,13 @@ public class AuthRequestUtil {
     public static final String REDIS_FAKE_LOGIN_FLAG_PREFIX = "GIC:HAOBAN:HAOBAN_MOBILE_APP:FAKE_LOGIN_TOKEN:";
     public static String LOGIN_SESSION_KEY = "HAOBAN:LOGINUSER";
 
-    public static LoginVO getSessionUser() {
-        String json = (String) getSession().getAttribute(LOGIN_SESSION_KEY);
-        if (StringUtils.isBlank(json)){
-            return null;
-        }
-        return JSON.parseObject(json, LoginVO.class);
-    }
+//    public static LoginVO getSessionUser() {
+//        String json = (String) getSession().getAttribute(LOGIN_SESSION_KEY);
+//        if (StringUtils.isBlank(json)){
+//            return null;
+//        }
+//        return JSON.parseObject(json, LoginVO.class);
+//    }
 
     public static void setSessionUser(Object obj) {
         String userJson = JSON.toJSONString(obj);

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

@@ -234,7 +234,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-count")
 	public HaobanResponse departmentRecycleCount() {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		Integer count = departmentApiService.departmentRecycleCount(wxEnterpriseId);
 		Map<String,Object> map = new HashMap<String, Object>();
@@ -270,7 +270,7 @@ public class DepartmentContoller extends WebBaseController{
 	@RequestMapping("department-batch-sync")
 	@ResponseBody
 	public HaobanResponse departmentBatchSync(@RequestBody SyncDepartmentQO args) {
-		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
 		String key = "haoban-sync-department-" + wxEnterpriseId;
 		if(RedisUtil.getCache(key) != null){
@@ -597,7 +597,7 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@RequestMapping("department-recycle-list")
 	public HaobanResponse departmentRecycleList(String keyWord,Integer storeFlag,BasePageInfo pageInfo) {
-		LoginVO login =  (LoginVO) AuthRequestUtil.getSessionUser();
+		LoginVO login =  (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId  = login.getWxEnterpriseId();
 		Integer recycleFlag = 1;
 		Page<DepartmentDTO> page = departmentApiService.pageDepartmentByParams(pageInfo,wxEnterpriseId,keyWord,storeFlag,recycleFlag);

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

@@ -157,7 +157,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTask(String wxEnterpriseId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<SyncTaskDTO> retPage = dealSyncOperationApiService.listSyncTask(wxEnterpriseId, pageInfo);
@@ -176,7 +176,7 @@ public class SyncDealContoller extends WebBaseController {
     @ResponseBody
     public HaobanResponse syncTaskDetail(String wxEnterpriseId, String taskId, BasePageInfo pageInfo) {
         if (StringUtils.isBlank(wxEnterpriseId)) {
-            LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+            LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
             wxEnterpriseId = login.getWxEnterpriseId();
         }
         Page<PreDealLogInfoDTO> retPage = dealSyncOperationApiService.listSyncTaskDetail(wxEnterpriseId, taskId, pageInfo);