diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java index 16e345f2..5b5ba8e7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java @@ -15,7 +15,6 @@ public class DeleteDeadLockParam { /** * 会员编号 */ - @NotNull(message = "会员编号不可为空") private String memberCode; /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java index 15b3da6e..9c5375ec 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.enums.EDelFlag; +import com.hzs.common.core.enums.EPlaceDept; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.account.service.ICuMemberAccountService; @@ -27,7 +28,11 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl queryDeleteDeadLockList(String memberCode) { - return baseMapper.queryDeleteDeadLockList(memberCode); + List deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode); + deleteDeadLockVOList.forEach(deleteDeadLockVO -> { + deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept()))); + }); + return deleteDeadLockVOList; } @Override diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java index 26eafa6c..8c12220f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java @@ -27,7 +27,7 @@ public class DeleteDeadLockVO { /** * 结算等级 */ - private Integer pkSettleGrade; + private String pkSettleGrade; /** * 推荐人编号 */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 2115007d..e238a184 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -3194,7 +3194,7 @@