From dae14456cb6a2cef11781036ae9b5356e7553d64 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 30 Oct 2023 11:28:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9?= =?UTF-8?q?=E6=AF=94):=20=E4=BF=9D=E5=AD=98=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/system/entity/Oauth.java | 2 +- .../com/jero/modules/system/entity/OauthAccessToken.java | 2 +- .../java/com/jero/modules/system/entity/OauthUserInfo.java | 2 +- .../modules/docking/iam/controller/IamLoginController.java | 2 +- .../controller/LawsCustomCompareInfoController.java | 5 ++--- .../customcompare/mapper/LawsCustomCompareCellMapper.java | 2 +- .../customcompare/mapper/LawsCustomCompareInfoMapper.java | 2 +- .../mapper/LawsCustomCompareInfoStandardMapper.java | 2 +- .../mapper/LawsCustomCompareInventoryMapper.java | 2 +- .../customcompare/service/ILawsCustomCompareInfoService.java | 4 +++- .../service/impl/LawsCustomCompareInfoServiceImpl.java | 4 +++- .../jero/modules/laws/customcompare/vo/StandardSaveVO.java | 2 +- .../jero/modules/laws/customcompare/vo/TableDetailVO.java | 2 +- .../laws/documenttool/common/DocumentSplitCommon.java | 2 +- .../laws/documenttool/entity/LawsDocumentSplitView.java | 2 +- .../main/java/com/jero/modules/split/enums/SplitEnum.java | 2 +- 16 files changed, 21 insertions(+), 18 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/Oauth.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/Oauth.java index cbe3a747..b8f05062 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/Oauth.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/Oauth.java @@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/09/26/10:07 * @Description: */ diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthAccessToken.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthAccessToken.java index e0a0408e..5aed521a 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthAccessToken.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthAccessToken.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/09/26/10:42 * @Description: */ diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java index 1457e4b6..ee53bfbe 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/OauthUserInfo.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/09/26/11:14 * @Description: */ diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java index 3ffb83cb..0953662b 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/IamLoginController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/17/10:09 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java index f826be20..4de9b033 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/controller/LawsCustomCompareInfoController.java @@ -155,9 +155,8 @@ public class LawsCustomCompareInfoController { @AutoLog(value = "自定义对比-标准检索保存") @ApiOperation(value="自定义对比-标准检索保存", notes="自定义对比-标准检索保存") @PostMapping(value = "/saveStandard") - public Result> saveStandard(@RequestBody StandardSaveVO standardSaveVO) { - lawsCustomCompareInfoService.saveStandard(standardSaveVO); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + public Result saveStandard(@RequestBody StandardSaveVO standardSaveVO) { + return Result.OK(MessageUtils.getMessage(ResultCommon.OK), lawsCustomCompareInfoService.saveStandard(standardSaveVO)); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java index afb73821..61774709 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareCellMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.laws.customcompare.entity.LawsCustomCompareCell; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/24/18:02 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java index 60d3aca8..a1c88589 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/24/17:50 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java index 8ee9bdc0..cb4b5fd8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInfoStandardMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInfoStandard; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/24/18:02 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java index 3fda3d78..5a1e3e8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/mapper/LawsCustomCompareInventoryMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.laws.customcompare.entity.LawsCustomCompareInventory; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/24/18:02 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java index 2c744c44..f2c30334 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java @@ -56,9 +56,11 @@ public interface ILawsCustomCompareInfoService extends IService() .eq(LawsCustomCompareCell::getInfoId, lawsCustomCompareInfo.getId()) .notIn(LawsCustomCompareCell::getStandardId, ids)); + + return lawsCustomCompareInfo.getId(); } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java index 6f59a666..fcde4ff6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/StandardSaveVO.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/25/15:25 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java index 9c0d3002..7fc07330 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/vo/TableDetailVO.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/25/15:56 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java index 07f55a76..01eb3a6e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java @@ -1,7 +1,7 @@ package com.jero.modules.laws.documenttool.common; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/13/11:46 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java index a2839e1b..e35dd583 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplitView.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/18/18:01 * @Description: */ diff --git a/laws-modules/src/main/java/com/jero/modules/split/enums/SplitEnum.java b/laws-modules/src/main/java/com/jero/modules/split/enums/SplitEnum.java index a39cf435..36a448ab 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/enums/SplitEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/split/enums/SplitEnum.java @@ -1,7 +1,7 @@ package com.jero.modules.split.enums; /** - * @Author: 31318 + * @Author: yjz * @Date: 2023/10/11/17:46 * @Description: */