注销账号接口4

common/src/main/java/com/pica/cloud/account/account/common/dto/CancelAccountDto.java

@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
  */
 public class CancelAccountDto {
 
-    @ApiModelProperty("医生ID")
-    private Integer doctorId;
-
     @ApiModelProperty("注销原因NO")
     private Integer reasonNo;
 
@@ -23,14 +20,6 @@ public class CancelAccountDto {
 
     private String remarks;
 
-    public Integer getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(Integer doctorId) {
-        this.doctorId = doctorId;
-    }
-
     public Integer getReasonNo() {
         return reasonNo;
     }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -280,8 +280,8 @@ public class DoctorServiceImpl implements DoctorService {
      */
     @Override
     public void cancelAccountByDoctorId(CancelAccountDto cancelAccountDto, PicaUser picaUser) {
-        logger.info("DoctorServiceImpl.deleteDoctorById CancelAccountDto：{}", JSON.toJSONString(cancelAccountDto));
-        Doctor doctor = doctorMapper.selectByPrimaryKey(cancelAccountDto.getDoctorId());
+        logger.info("DoctorServiceImpl.deleteDoctorById CancelAccountDto：{}; USER: {}", JSON.toJSONString(cancelAccountDto), JSON.toJSONString(picaUser));
+        Doctor doctor = doctorMapper.selectByPrimaryKey(picaUser.getId());
         if (Objects.isNull(doctor)) {
             throw new PicaException(PicaResultCode.PARAM_NOT_COMPLETE.code(), "未查询到要删除的用户");
         }
@@ -348,6 +348,7 @@ public class DoctorServiceImpl implements DoctorService {
         /**log*/
         CancelAccountLog cancelAccountLog = new CancelAccountLog();
         BeanUtils.copyProperties(cancelAccountDto, cancelAccountLog);
+        cancelAccountLog.setDoctorId(picaUser.getId());
         cancelAccountLog.setDeleteFlag(1);
         cancelAccountLog.setCreatId(picaUser.getId());
         cancelAccountLog.setCreatTime(new Date());