From 49dbcdadd860b7613063ee618fbe38a0593d5bd9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 15:45:29 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java |   36 +++++++-----------------------------
 1 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
index 795bc8c..6b70765 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/NavigationBarServiceImpl.java
@@ -42,11 +42,11 @@
     @Override
     public Result getBarInPage(AdminNavigationBarDto adminNavigationBarDto) {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
-        long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
         Page<AdminNavigationBarVo> page = new Page<>(adminNavigationBarDto.getPageNum(), adminNavigationBarDto.getPageSize());
         NavigationBarEntity navigationBarEntity = new NavigationBarEntity();
         navigationBarEntity.setParentId(NavigationBarEntity.PARENTID_DEFAULT);
-        navigationBarEntity.setBelongId(belongId);
+        navigationBarEntity.setCompanyId(companyId);
         IPage<AdminNavigationBarVo> list = navigationBarMapper.selectAdminNavigationBarVoInPage(page,navigationBarEntity);
         List<AdminNavigationBarVo> records = list.getRecords();
         if(CollUtil.isNotEmpty(records)){
@@ -78,13 +78,10 @@
     @Transactional
     public Result addBar(AdminAddBarDto adminAddBarDto) {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
-        long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
         NavigationBarEntity navigationBarEntity = new NavigationBarEntity();
-        navigationBarEntity.setBelongId(belongId);
+        navigationBarEntity.setCompanyId(companyId);
         String barName = adminAddBarDto.getBarName();
-        if(StrUtil.isEmpty(barName)){
-            return Result.fail("请输入导航栏标题");
-        }
         navigationBarEntity.setBarName(barName);
         Long parentId = adminAddBarDto.getParentId();
         if(ObjectUtil.isEmpty(parentId)){
@@ -93,21 +90,13 @@
             navigationBarEntity.setParentId(parentId);
         }
         String linkUrl = adminAddBarDto.getLinkUrl();
-        if(StrUtil.isNotEmpty(linkUrl)){
             navigationBarEntity.setLinkUrl(linkUrl);
-        }
         Integer orderNum = adminAddBarDto.getOrderNum();
-        if(ObjectUtil.isNotEmpty(orderNum)){
             navigationBarEntity.setOrderNum(orderNum);
-        }
         String pic = adminAddBarDto.getPic();
-        if(StrUtil.isNotEmpty(pic)){
             navigationBarEntity.setPic(pic);
-        }
         String remark = adminAddBarDto.getRemark();
-        if(StrUtil.isNotEmpty(remark)){
             navigationBarEntity.setRemark(remark);
-        }
         navigationBarMapper.insert(navigationBarEntity);
         return Result.ok("添加成功");
     }
@@ -158,9 +147,6 @@
             return Result.fail("导航栏不存在");
         }
         String barName = adminUpdateMenuDto.getBarName();
-        if(StrUtil.isEmpty(barName)){
-            return Result.fail("请输入导航栏标题");
-        }
         navigationBarEntity.setBarName(barName);
         Long parentId = adminUpdateMenuDto.getParentId();
         if(ObjectUtil.isEmpty(parentId)){
@@ -169,21 +155,13 @@
             navigationBarEntity.setParentId(parentId);
         }
         String linkUrl = adminUpdateMenuDto.getLinkUrl();
-        if(StrUtil.isNotEmpty(linkUrl)){
             navigationBarEntity.setLinkUrl(linkUrl);
-        }
         Integer orderNum = adminUpdateMenuDto.getOrderNum();
-        if(ObjectUtil.isNotEmpty(orderNum)){
             navigationBarEntity.setOrderNum(orderNum);
-        }
         String pic = adminUpdateMenuDto.getPic();
-        if(StrUtil.isNotEmpty(pic)){
             navigationBarEntity.setPic(pic);
-        }
         String remark = adminUpdateMenuDto.getRemark();
-        if(StrUtil.isNotEmpty(remark)){
             navigationBarEntity.setRemark(remark);
-        }
         navigationBarMapper.updateById(navigationBarEntity);
         return Result.ok("更新成功");
     }
@@ -191,12 +169,12 @@
     @Override
     public Result getBarInList() {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
-        long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
-        List<AdminNavigationBarVo> records = navigationBarMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT,belongId);
+        long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
+        List<AdminNavigationBarVo> records = navigationBarMapper.selectAdminNavigationBarVoByParentId(NavigationBarEntity.PARENTID_DEFAULT,companyId);
         if(CollUtil.isNotEmpty(records)){
             for(AdminNavigationBarVo adminNavigationBarVo : records){
                 Long id = adminNavigationBarVo.getId();
-                List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectListByParentId(id,belongId);
+                List<NavigationBarEntity> navigationBarEntities = navigationBarMapper.selectListByParentId(id,companyId);
                 List<AdminNavigationBarVo> adminNavigationBarVoChilds = new ArrayList<>();
                 if(CollUtil.isNotEmpty(navigationBarEntities)){
                     for(NavigationBarEntity navigationBarEntityChild : navigationBarEntities){

--
Gitblit v1.9.1