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; /**注册时间*/