commit

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java

@@ -85,7 +85,7 @@ public class CondolenceTypeController {
 	@ApiOperation("查询职工慰问类型")
 	@SaCheckLogin
 	public Result queryCondolenceType() {
-		List<CondolenceType> list = typeService.query(Cnd.NEW().desc(CondolenceType::getCode));
+		List<CondolenceType> list = typeService.query(Cnd.where(CondolenceType::getEnable, "=", true).desc(CondolenceType::getCode));
 		return Result.success(list);
 	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java

@@ -48,9 +48,10 @@ public class CondolenceType extends BaseModel {
 	private String way;
 
 	@Column
-	@Comment("是否禁用")
+	@Comment("是否启用")
 	@ColDefine(type = ColType.BOOLEAN)
-	private Boolean isDisabled;
+	@Default("1")
+	private Boolean enable;
 
 	@Column
 	@Comment("是否上传附件")