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..43ba3037 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 @@ -48,7 +53,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl SELECT cu.MEMBER_CODE, - cu.MEMBER_NAME,cu.PK_SETTLE_GRADE, + cu.MEMBER_NAME,bdg.GRADE_NAME as pkSettleGrade, cus.MEMBER_CODE AS parMemberCode, cuss.MEMBER_CODE AS placeMemberCode,cu.PLACE_DEPT, cu.CREATION_TIME @@ -3202,6 +3202,7 @@ CU_MEMBER cu LEFT JOIN CU_MEMBER cus ON cu.PK_PARENT = cus.PK_ID LEFT JOIN CU_MEMBER cuss ON cu.PK_PLACE_PARENT = cuss.PK_ID + LEFT JOIN BD_GRADE bdg ON cu.PK_SETTLE_GRADE = bdg.PK_ID WHERE cu.DEL_FLAG = 0 AND cu.CATEGORY = 2