From 6c82b0f944a0d3547659db5ec1f640a9ec7d3fd3 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 15 Jun 2022 11:08:52 +0800 Subject: [PATCH] 20220606 --- src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/WebSetServiceImpl.java | 17 +++++------------ 1 files changed, 5 insertions(+), 12 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..bd64743 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,10 +25,10 @@ @Override public Result seeWebSetInfo() { UserEntity userlogin = LoginUserUtil.getLoginUser(); - long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId(); + long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId(); AdminSeeWebSetInfoVo adminSeeWebSetInfoVo = new AdminSeeWebSetInfoVo(); QueryWrapper<WebSetEntity> objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("belong_id",belongId); + objectQueryWrapper.eq("company_id",companyId); List<WebSetEntity> webSetEntities = this.baseMapper.selectList(new QueryWrapper<>()); if(CollUtil.isNotEmpty(webSetEntities)){ WebSetEntity webSetEntity = webSetEntities.get(0); @@ -44,20 +44,13 @@ @Override public Result updateWebSet(AdminUpdateWebSetDto adminUpdateWebSetDto) { UserEntity userlogin = LoginUserUtil.getLoginUser(); - long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId(); + long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId(); 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); + objectQueryWrapper.eq("company_id",companyId); WebSetEntity webSetEntity = this.baseMapper.selectOne(objectQueryWrapper); -// WebSetEntity webSetEntity = this.baseMapper.selectById(id); if(ObjectUtil.isEmpty(webSetEntity)){ WebSetEntity webSetEntityAdd = new WebSetEntity(); webSetEntityAdd.setWebTitle(webTitle); @@ -70,7 +63,7 @@ if(StrUtil.isNotEmpty(webPic)){ webSetEntityAdd.setWebPic(webPic); } - webSetEntityAdd.setBelongId(belongId); + webSetEntityAdd.setCompanyId(companyId); this.baseMapper.insert(webSetEntityAdd); return Result.ok("保存成功"); } -- Gitblit v1.9.1