diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
index fb9f22be3..2d030a039 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
@@ -5,9 +5,12 @@ import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jero.modules.config.entity.SysConfig;
+import com.jero.modules.config.service.ISysConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CacheConstant;
@@ -59,6 +62,8 @@ public class LoginController {
     private ISysDepartService sysDepartService;
 	@Autowired
     private ISysDictService sysDictService;
+	@Autowired
+    private ISysConfigService iSysConfigService;
 	@Resource
 	private BaseCommonService baseCommonService;
 
@@ -411,6 +416,14 @@ public class LoginController {
 			// update-end--Author:wangshuai Date:20200805 for：如果用戶为选择部门，数据库为存在上一次登录部门，则取一条存进去
 			obj.put("multi_depart", 2);
 		}
+		//获取配置信息
+		List<SysConfig> sysConfigs = iSysConfigService.queryList();
+		if(CollectionUtils.isNotEmpty(sysConfigs)){
+			for (SysConfig sysConfig : sysConfigs) {
+				obj.put(sysConfig.getConfigName(),sysConfig.getConfig());
+			}
+		}
+
 		obj.put("token", token);
 		obj.put("userInfo", sysUser);
 		obj.put("sysAllDictItems", sysDictService.queryAllDictItems());