From 2f01c8ab8374eeb6b7f6afa80958489da61cdd68 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 18 十一月 2022 17:55:08 +0800
Subject: [PATCH] 修改导办人员添加多部门切换
---
flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
index 269b9f5..c95f139 100644
--- a/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
+++ b/flower_city/src/main/java/com/dg/core/resolvers/CurrentUserMethodArgumentResolver.java
@@ -2,7 +2,9 @@
import com.dg.core.Constant;
import com.dg.core.annotation.CurrentUser;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.service.IHuaChengSysUserService;
import com.dg.core.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.MethodParameter;
@@ -14,6 +16,8 @@
import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.multipart.support.MissingServletRequestPartException;
+import java.util.List;
+
/**
* 增加方法注入，将含有CurrentUser注解的方法参数注入当前登录用户
*/
@@ -22,6 +26,12 @@
@Autowired
private ISysUserService userService;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
@Override
public boolean supportsParameter(MethodParameter parameter) {
@@ -39,7 +49,28 @@
Long currentUserId = (Long) webRequest.getAttribute(Constant.CURRENT_USER_ID, RequestAttributes.SCOPE_REQUEST);
if (currentUserId != null) {
//从数据库中查询并返回
- return userService.selectData(currentUserId+"");
+ SysUser sysUser=userService.selectData(currentUserId+"",null,null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData(currentUserId+"","","");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ if(huaChengSysUser!=null)
+ {
+ sysUser=userService.selectData(null,huaChengSysUser.getPhone(),null);
+ if(sysUser!=null)
+ {
+ return sysUser;
+ }
+ }
}
return null;
// throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
--
Gitblit v1.7.1