diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index cf6274508..e4640f0d3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -85,7 +85,6 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.queryExitData(onlCgformTag); - QueryWrapper queryWrapper = new QueryWrapper<>(); onlCgformTagService.add(onlCgformTag); return Result.OK("添加成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index e45344594..e67130640 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -60,10 +60,9 @@ public class OnlCgformTag implements Serializable { private java.lang.String sysOrgCode; /**所属模块(1文档库,0文档拆分)*/ - @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15, dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model") - //@Dict(dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model") + @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module") @Dict(dicCode = "module") - @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") + @ApiModelProperty(value = "所属模块(1文档库,0文档拆分") private java.lang.String isModel; /**字段备注*/ @@ -77,8 +76,8 @@ public class OnlCgformTag implements Serializable { private java.lang.String dbFieldName; /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15, dictTable = "onl_cgform_field", dicText = "field_show_type", dicCode = "field_show_type") - @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type", dicCode = "field_show_type") + @Excel(name = "表单控件类型", width = 15, dicCode = "field_show_type") + @Dict(dicCode = "field_show_type") @ApiModelProperty(value = "表单控件类型") private java.lang.String fieldShowType; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 4ae59e824..ade83ea48 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -1,10 +1,12 @@ package com.jero.modules.tag.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -83,16 +85,6 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryShowAreaById(String id) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.select("show_area").eq("id",id); - return list(queryWrapper); - } - /** * 列表查询 * @@ -105,14 +97,21 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt())); - Integer count = Math.toIntExact(onlCgformTagMapper.selectCount(queryWrapper)); - } + public Result queryExitData(OnlCgformTag onlCgformTag) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {// && StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) { + queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).and(wq -> wq.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt())); + } + Integer count = onlCgformTagMapper.selectCount(queryWrapper); + if (count > 0) { + return Result.error("该数据已存在"); + } else { + return Result.OK(); + } + } }