diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
index 915bfebcf..10e880fa3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java
@@ -37,4 +37,8 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme
@TableField(exist = false)
private String userTypes;
+
+ @TableField(exist = false)
+ private String dreForAuth;
+
}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index eae391745..eaff585c2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -55,13 +55,13 @@
AND sdt = #{paramsCollectManifestEO.sdt} AND state != '1'
- AND dre = #{paramsCollectManifestEO.dre}
+ AND dre = #{paramsCollectManifestEO.dreForAuth}
- AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre}) AND state != '1'
+ AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth}) AND state != '1'
- AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
+ AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dreForAuth})
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9638c85b2..a816a1d6f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -225,13 +225,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 9d7843ed8..0130fcff3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -221,7 +221,8 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的
.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件:适用地区
- .like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()); // 查询条件:参数模板
+ .like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()) // 查询条件:参数模板
+ .orderByDesc(ParamsTemplateEO::getCreateTime); // 按创建时间倒叙排序
return paramsTemplateEOService.page(page, queryWrapper);
}
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index 16eea6876..da0342455 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -132,6 +132,9 @@ public class ParamsInfoEOController extends JeroController add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
+ if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+ return Result.error("认证类别不能为空!");
+ }
boolean isSuccess = paramsInfoEOService.add(paramsInfoEO);
if (isSuccess) {
return Result.OK("添加成功!");
@@ -151,6 +154,9 @@ public class ParamsInfoEOController extends JeroController edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
+ if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
+ return Result.error("认证类别不能为空!");
+ }
boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO);
if (isSuccess) {
return Result.OK("编辑成功!");
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
index 51b3ff496..198f7b38b 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
@@ -64,7 +64,7 @@ public class ParamsTemplateEOController extends JeroController queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName())
.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion())
- .eq(StringUtils.isNotEmpty(paramsTemplateEO.getState()), ParamsTemplateEO::getState, paramsTemplateEO.getState())
+// .eq(StringUtils.isNotEmpty(paramsTemplateEO.getState()), ParamsTemplateEO::getState, paramsTemplateEO.getState())
.orderByDesc(ParamsTemplateEO::getUpdateTime);
Page page = new Page(pageNo, pageSize);
IPage pageList = paramsTemplateEOService.page(page, queryWrapper);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
index 333df4516..22c3ed3b3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java
@@ -65,10 +65,10 @@ public class ParamsTemplateEO implements Serializable {
private java.lang.String paramsTemplateName;
/**状态*/
- @Excel(name = "状态", width = 15)
- @Dict(dicCode = "params_template_state")
- @ApiModelProperty(value = "状态")
- private java.lang.String state;
+// @Excel(name = "状态", width = 15)
+// @Dict(dicCode = "params_template_state")
+// @ApiModelProperty(value = "状态")
+// private java.lang.String state;
/**适用地区*/
@Excel(name = "适用地区", width = 15, dicCode = "region")
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
index 5b7587a71..09b811631 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsTemplateEOMapper.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index cb707f55c..d447a460c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -101,6 +101,13 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
+ List paramsInfoEOList = list(queryWrapper);
+ if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
+ throw new JeroBootException("NIO编号已存在!");
+ }
+
// 批量添加认证类别参数
List certCategoryParamsInfoEOList = paramsInfoEO.getCertCategoryParamsInfoEOList();
if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOList)) {
@@ -160,6 +167,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber());
+ List paramsInfoEOList = list(queryWrapper);
+ if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
+ throw new JeroBootException("NIO编号已存在!");
+ }
+ }
+
String oldNioNumber = oldParamsInfoEO.getNioNumber();
// 认证类别参数项 先删除后添加
certCategoryParamsInfoEOService.deleteByNioNumberList(Arrays.asList(oldNioNumber), paramsTemplateId);