From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
index edd33a0..b499d5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
@@ -18,8 +18,8 @@
import com.yeshi.fanli.dao.mybatis.homemodule.SuperHomeNavbarMapper;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
import com.yeshi.fanli.entity.bus.homemodule.SuperHomeNavbar;
-import com.yeshi.fanli.entity.system.System;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
import com.yeshi.fanli.util.StringUtil;
@@ -28,7 +28,7 @@
public class HomeNavbarServiceImpl implements HomeNavbarService {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private HomeNavbarMapper homeNavbarMapper;
@Resource
@@ -101,7 +101,7 @@
return null;
}
- List<System> systemList = systemService.getSystems();
+ List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();
List<Long> listId = new ArrayList<Long>();
for (HomeNavbar homeNavbar: listObj) {
@@ -119,12 +119,12 @@
for (HomeNavbar homeNavbar: listObj) {
Long id = homeNavbar.getId();
- List<System> newList = new ArrayList<System>();
+ List<BusinessSystem> newList = new ArrayList<BusinessSystem>();
// 鏄惁鏈夊叧鑱旂郴缁熼�夐」
- for (System dsystem : systemList) {
+ for (BusinessSystem dsystem : systemList) {
- System newsystem = new System();
+ BusinessSystem newsystem = new BusinessSystem();
try {
PropertyUtils.copyProperties(newsystem, dsystem);
} catch (Exception e) {
@@ -136,7 +136,7 @@
for (SuperHomeNavbar superHomeNavbar : listSuper) {
HomeNavbar navbar = superHomeNavbar.getHomeNavbar();
- System system = superHomeNavbar.getSystem();
+ BusinessSystem system = superHomeNavbar.getSystem();
// 褰撳墠涓撻 銆佸綋鍓嶇郴缁�
if (navbar != null && system != null && id == navbar.getId()
--
Gitblit v1.8.0