From 1af1c5e0a1f30f55ae5d8bd41443872f8ad02031 Mon Sep 17 00:00:00 2001 From: lhc Date: Thu, 16 Dec 2021 15:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8Serive?= =?UTF-8?q?=EF=BC=8Cupdate=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hcframe/base/module/data/module/BaseMapperImpl.java | 2 -- .../base/module/data/service/impl/TableServiceImpl.java | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java index 548874c..79998af 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/module/BaseMapperImpl.java @@ -75,7 +75,6 @@ public class BaseMapperImpl implements BaseMapper { dataMap.setPkValue(id); } SqlException.base(i, "保存失败"); - dataMap.toBuilder().remove("id"); return i; } @@ -117,7 +116,6 @@ public class BaseMapperImpl implements BaseMapper { data.put(pkName, data.get("id")); } SqlException.base(i, "保存失败"); - data.remove("id"); return i; } diff --git a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java index c33bf5d..b315910 100644 --- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java +++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/impl/TableServiceImpl.java @@ -246,6 +246,12 @@ public class TableServiceImpl implements TableService { @Override public PageInfo> getReference(OsSysTable tableName, String data, WebPageInfo webPageInfo, String target, String id) { + if (StringUtils.isEmpty(target)) { + return new PageInfo<>(); + } + if (StringUtils.isEmpty(id)) { + return new PageInfo<>(); + } Condition.ConditionBuilder builder = getMapList(tableName, data); builder.andEqual(target, id); return baseMapper.selectByCondition(builder.build(), webPageInfo);