From 56eded01813a06ea1048b42919af021900e5f813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Jun 2022 15:58:30 +0800
Subject: [PATCH] 20220606

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
index d814c95..b01fafc 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java
@@ -25,7 +25,7 @@
     @Override
     public Result seeWebSetInfo() {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
-        long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+        long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
         AdminSeeWebSetInfoVo adminSeeWebSetInfoVo = new AdminSeeWebSetInfoVo();
         QueryWrapper<WebSetEntity> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("belong_id",belongId);
@@ -44,20 +44,13 @@
     @Override
     public Result updateWebSet(AdminUpdateWebSetDto adminUpdateWebSetDto) {
         UserEntity userlogin = LoginUserUtil.getLoginUser();
-        long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+        long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
         String webTitle = adminUpdateWebSetDto.getWebTitle();
-        if(StrUtil.isEmpty(webTitle)){
-            return Result.fail("请输入网页标题");
-        }
         String webKeyword = adminUpdateWebSetDto.getWebKeyword();
-        if(StrUtil.isEmpty(webKeyword)){
-            return Result.fail("请输入网页关键字");
-        }
         Long id = adminUpdateWebSetDto.getId() == null ? 0L : adminUpdateWebSetDto.getId();
         QueryWrapper<WebSetEntity> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("belong_id",belongId);
         WebSetEntity webSetEntity = this.baseMapper.selectOne(objectQueryWrapper);
-//        WebSetEntity webSetEntity = this.baseMapper.selectById(id);
         if(ObjectUtil.isEmpty(webSetEntity)){
             WebSetEntity webSetEntityAdd = new WebSetEntity();
             webSetEntityAdd.setWebTitle(webTitle);

--
Gitblit v1.9.1