Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java

@@ -309,6 +309,13 @@
            accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
            return accountDTO;
        }
        //禁止删除自己的账号
        AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
        if(accountInfo.getAccount().getId().equals(accountId)){
            accountDTO.setCode(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getCode());
            accountDTO.setMsg(ResponseCodeEnum.CANNOT_DELETE_ONESELF.getMsg());
            return accountDTO;
        }
        //逻辑删除账号
        UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
        deleteAccountWrapper.eq("id", accountId);