From b9d39ade7d516d714cd8df7956bf34cf3a3fb8b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 17 Aug 2021 17:31:26 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
index a9f0527..6f04363 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
@@ -1,23 +1,19 @@
package com.matrix.system.common.init;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import com.matrix.core.exception.GlobleException;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.SysCompany;
-import com.matrix.system.common.service.SysCompanyService;
+import com.matrix.system.common.dao.SysCompanyDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.context.ServletContextAware;
-import com.matrix.core.constance.MatrixConstance;
+import javax.servlet.ServletContext;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
/**
*
@@ -39,7 +35,8 @@
@Autowired
- private SysCompanyService sysCompanyService;
+ private SysCompanyDao sysCompanyDao;
+
@@ -68,7 +65,7 @@
// 初始化语言环境
initLanguage();
//初始化公司
- initParams();
+ //initParams();
LogUtil.info("\r\n\r\n**********************************************\r\n"
+ "* =========== Matrix启动成功 ===========\r\n"
+ "* DEBUG模式:" + debug+"*\r\n"
@@ -113,7 +110,7 @@
public void initParams() {
//初始化所有的公司
- List<SysCompany> company=sysCompanyService.findByModel(null);
+ List<SysCompany> company=sysCompanyDao.selectAll();
Map<String, SysCompany> companyMap=new HashMap<>();
for (SysCompany sysCompany : company) {
companyMap.put(sysCompany.getComWebUrl(), sysCompany);
--
Gitblit v1.9.1