submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -141,7 +141,15 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         lqw.eq(bo.getPosterTempId() != null, DistributionActivityTemplate::getPosterTempId, bo.getPosterTempId());
         lqw.eq(bo.getStartTime() != null, DistributionActivityTemplate::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, DistributionActivityTemplate::getEndTime, bo.getEndTime());
-        return entity2Vo(this.list(lqw));
+        List<DistributionActivityTemplateVo> voList = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isEmpty(voList)){
+            return new ArrayList<>();
+        }
+        voList.forEach(item -> {
+            DistributionActivityTemplatePoster templatePoster = iDistributionActivityTemplatePosterService.getById(item.getPosterTempId());
+            item.setPosterTempName(templatePoster.getName());
+        });
+        return voList;
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/vo/DistributionActivityTemplateVo.java

@@ -52,6 +52,8 @@ public class DistributionActivityTemplateVo {
 	@Excel(name = "海报模板ID")
 	@ApiModelProperty("海报模板ID")
 	private Long posterTempId;
+	@ApiModelProperty("海报模板")
+	private String posterTempName;
 	/** 开始时间 */
 	@Excel(name = "开始时间")
 	@ApiModelProperty("开始时间")

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/domain/TopSysMenu.java

@@ -1,6 +1,5 @@
 package com.zhongzheng.modules.top.user.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -53,16 +52,12 @@ private static final long serialVersionUID=1L;
     /** 菜单图标 */
     private String icon;
     /** 创建者 */
-    @TableField(fill = FieldFill.INSERT)
     private String createBy;
     /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
     /** 更新者 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
     /** 更新时间 */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
     /** 备注 */
     private String remark;