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 |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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 3ba0015..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
@@ -4,9 +4,11 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xcong.farmer.cms.common.response.Result;
 import com.xcong.farmer.cms.modules.system.dto.AdminUpdateWebSetDto;
+import com.xcong.farmer.cms.modules.system.entity.UserEntity;
 import com.xcong.farmer.cms.modules.system.entity.WebSetEntity;
 import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
 import com.xcong.farmer.cms.modules.system.service.IWebSetService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
 import com.xcong.farmer.cms.modules.system.vo.AdminSeeWebSetInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -22,7 +24,11 @@
 public class WebSetServiceImpl extends ServiceImpl<WebSetMapper, WebSetEntity> implements IWebSetService {
     @Override
     public Result seeWebSetInfo() {
+        UserEntity userlogin = LoginUserUtil.getLoginUser();
+        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);
         List<WebSetEntity> webSetEntities = this.baseMapper.selectList(new QueryWrapper<>());
         if(CollUtil.isNotEmpty(webSetEntities)){
             WebSetEntity webSetEntity = webSetEntities.get(0);
@@ -37,16 +43,14 @@
 
     @Override
     public Result updateWebSet(AdminUpdateWebSetDto adminUpdateWebSetDto) {
+        UserEntity userlogin = LoginUserUtil.getLoginUser();
+        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();
-        WebSetEntity webSetEntity = this.baseMapper.selectById(id);
+        QueryWrapper<WebSetEntity> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("belong_id",belongId);
+        WebSetEntity webSetEntity = this.baseMapper.selectOne(objectQueryWrapper);
         if(ObjectUtil.isEmpty(webSetEntity)){
             WebSetEntity webSetEntityAdd = new WebSetEntity();
             webSetEntityAdd.setWebTitle(webTitle);
@@ -59,6 +63,7 @@
             if(StrUtil.isNotEmpty(webPic)){
                 webSetEntityAdd.setWebPic(webPic);
             }
+            webSetEntityAdd.setBelongId(belongId);
             this.baseMapper.insert(webSetEntityAdd);
             return Result.ok("保存成功");
         }

--
Gitblit v1.9.1