Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

 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()