diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java index 4da8c86..aa07bbf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java @@ -31,6 +31,12 @@ public class Template extends MpBaseEntity /** 内容 */ private String content; + /** 是否需要预填1否,10是 */ + private Integer needPre; + + /** 类型1普通模板,10敏感模板 */ + private Integer type; + /** 部门名称 */ @TableField(exist = false) private String deptName; @@ -86,6 +92,22 @@ public class Template extends MpBaseEntity return content; } + public Integer getNeedPre() { + return needPre; + } + + public void setNeedPre(Integer needPre) { + this.needPre = needPre; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getDeptName() { return deptName; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java index 646f9ff..4020041 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/TemplateServiceImpl.java @@ -42,6 +42,7 @@ public class TemplateServiceImpl extends ServiceImpl i if(template.getStatus()!=null && template.getStatus().intValue()>0){ queryWrapper.eq("t.status",template.getStatus()); } + queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper); }