BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 89e785dc49c6641ea53e56e3fe571e8589acd6e2

Authored by 芋道源码
Committed by Gitee
2 parents a3a37926 206b5a5e

!457 【轻量级 PR】：解决敏感词导出和字典数据编辑保存的两个BUG 

Merge pull request !457 from clockdotnet/master_pr
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java
  View file @89e785d
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo;
2 2  
3 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
  5 +import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert;
5 6 import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
6 7 import com.alibaba.excel.annotation.ExcelProperty;
7 8 import lombok.Data;
... ... @@ -23,7 +24,7 @@ public class SensitiveWordExcelVO {
23 24 @ExcelProperty("敏感词")
24 25 private String name;
25 26  
26   - @ExcelProperty("标签")
  27 + @ExcelProperty(value = "标签", converter = JsonConvert.class)
27 28 private List<String> tags;
28 29  
29 30 @ExcelProperty(value = "状态", converter = DictConvert.class)
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictDataDO.java
  View file @89e785d
... ... @@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.system.dal.dataobject.dict;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5   -import com.baomidou.mybatisplus.annotation.KeySequence;
6   -import com.baomidou.mybatisplus.annotation.TableId;
7   -import com.baomidou.mybatisplus.annotation.TableName;
  5 +import com.baomidou.mybatisplus.annotation.*;
8 6 import lombok.Data;
9 7 import lombok.EqualsAndHashCode;
10 8  
... ... @@ -57,6 +55,7 @@ public class DictDataDO extends BaseDO {
57 55 /**
58 56 * css 样式
59 57 */
  58 + @TableField(updateStrategy = FieldStrategy.IGNORED)
60 59 private String cssClass;
61 60 /**
62 61 * 备注
... ...