From ae1bf9fcf4cd724710f3e6d402a4090b53f2c3f3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 2 Sep 2021 11:03:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/TbMemberProjectSubitemController.java | 5 +++++ .../java/com/jero/member/entity/TbMemberProjectSubitem.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java index b15bfc4a..f06cbad9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.PasswordUtil; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.service.ITbMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -49,6 +50,10 @@ public class TbMemberProjectSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); IPage pageList = tbMemberProjectSubitemService.page(page, queryWrapper); + for (TbMemberProjectSubitem record : pageList.getRecords()) { + record.setEmail(PasswordUtil.decrypt(record.getEmail())); + record.setMobile(PasswordUtil.decrypt(record.getMobile())); + } return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index ae292134..a78c9417 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -68,7 +68,7 @@ public class TbMemberProjectSubitem implements Serializable { /**公司id*/ @Excel(name = "公司id", width = 15) @ApiModelProperty(value = "公司id") - private Integer userId; + private String companyId; /**公司名称*/ @Excel(name = "公司名称", width = 15) @@ -78,6 +78,7 @@ public class TbMemberProjectSubitem implements Serializable { /**会员类型*/ @Excel(name = "会员类型", width = 15) @ApiModelProperty(value = "会员类型") + @Dict(dicCode = "member_type") private Integer memberType; /**联系人*/ @@ -98,6 +99,7 @@ public class TbMemberProjectSubitem implements Serializable { /**会员状态*/ @Excel(name = "会员状态", width = 15) @ApiModelProperty(value = "会员状态") + @Dict(dicCode = "member_status") private Integer memberStatus; /**注册时间*/