diff --git a/src/com/engine/organization/annotation/Log.java b/src/com/engine/organization/annotation/Log.java
index 35b4810f..124c5ea7 100644
--- a/src/com/engine/organization/annotation/Log.java
+++ b/src/com/engine/organization/annotation/Log.java
@@ -5,12 +5,11 @@ import com.engine.organization.enums.OperateTypeEnum;
import java.lang.annotation.*;
/**
- * @Author weaver_cl
+ * @Author dxfeng
* @Description: TODO
- * @Date 2022/4/27
+ * @Date 2022/5/9
* @Version V1.0
**/
-
@Target({ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
diff --git a/src/com/engine/organization/annotation/OrganizationTable.java b/src/com/engine/organization/annotation/OrganizationTable.java
index e5f89e50..0217da51 100644
--- a/src/com/engine/organization/annotation/OrganizationTable.java
+++ b/src/com/engine/organization/annotation/OrganizationTable.java
@@ -6,12 +6,10 @@ import com.cloudstore.eccom.pc.table.WeaTableType;
import java.lang.annotation.*;
/**
- * 数据列表
- *
Copyright: Copyright (c) 2022
- * Company: 泛微软件
- *
- * @author qiantao
- * @version 1.0
+ * @Author dxfeng
+ * @Description: TODO
+ * @Date 2022/5/9
+ * @Version V1.0
**/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/com/engine/organization/annotation/OrganizationTableColumn.java b/src/com/engine/organization/annotation/OrganizationTableColumn.java
index ea73ce9d..7467de68 100644
--- a/src/com/engine/organization/annotation/OrganizationTableColumn.java
+++ b/src/com/engine/organization/annotation/OrganizationTableColumn.java
@@ -3,12 +3,10 @@ package com.engine.organization.annotation;
import java.lang.annotation.*;
/**
- * 数据列表表头
- * Copyright: Copyright (c) 2022
- * Company: 泛微软件
- *
- * @author qiantao
- * @version 1.0
+ * @Author dxfeng
+ * @Description: TODO
+ * @Date 2022/5/9
+ * @Version V1.0
**/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/com/engine/organization/annotation/OrganizationTableOperate.java b/src/com/engine/organization/annotation/OrganizationTableOperate.java
index 38a2ea36..3df682bd 100644
--- a/src/com/engine/organization/annotation/OrganizationTableOperate.java
+++ b/src/com/engine/organization/annotation/OrganizationTableOperate.java
@@ -3,12 +3,10 @@ package com.engine.organization.annotation;
import java.lang.annotation.*;
/**
- * 列表操作按钮
- * Copyright: Copyright (c) 2022
- * Company: 泛微软件
- *
- * @author qiantao
- * @version 1.0
+ * @Author dxfeng
+ * @Description: TODO
+ * @Date 2022/5/9
+ * @Version V1.0
**/
@Target({ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
index 7792bdc8..22d40a32 100644
--- a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
+++ b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
@@ -83,7 +83,7 @@ public class SchemeDTO {
.schemeNo(param.getSchemeNo() == null ? null : param.getSchemeNo())
.schemeName(param.getSchemeName() == null ? null : param.getSchemeName())
.schemeDescription(param.getSchemeDescription() == null ? null : param.getSchemeDescription())
- .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 1 : 0)
+ .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 1 : 0)
.deleteType(0)
.createTime(new Date())
.updateTime(new Date())
diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
index b5efb4b0..9dd69157 100644
--- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
@@ -39,6 +39,9 @@ public class SchemeTableVO {
private Long id;
+ /**
+ * 方案编号
+ */
@OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no")
private String schemeNo;
/**
@@ -47,11 +50,15 @@ public class SchemeTableVO {
@OrganizationTableColumn(text = "方案名称", width = "25%", column = "scheme_name")
private String schemeName;
- //薪资档案引用
+ /**
+ * 方案描述
+ */
@OrganizationTableColumn(text = "方案说明", width = "25%", column = "scheme_description")
private String schemeDescription;
- //默认使用
+ /**
+ * 禁用标识
+ */
@OrganizationTableColumn(text = "禁用标记", width = "25%", column = "forbidden_tag")
private Integer forbiddenTag;
}
diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index 4382a663..a524250b 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -27,8 +27,9 @@
, t.create_time
, t.update_time
-
-