fixed

src/main/java/cn/cslg/pas/common/model/report/QueryMatchCasePersonVO.java

@@ -28,4 +28,5 @@ public class QueryMatchCasePersonVO {
     private Integer assoAccountId;
     private String accountName;
     private String accountUserName;
+    private Boolean isDelete;
 }

src/main/java/cn/cslg/pas/service/report/MatchCasePersonService.java

@@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.cslg.pas.domain.report.MatchCasePerson;
 import cn.cslg.pas.mapper.report.MatchCasePersonMapper;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -89,7 +91,7 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
             queryWrapper.eq(IprPerson::getTenantId, tenantId);
             IprPerson iprPerson = iprPersonService.getOne(queryWrapper, false);
             if (iprPerson != null) {
-                if (!name.trim().equals(iprPerson.getName().trim()) || !assoAccountId.equals(iprPerson.getAssoAccountId())) {
+                if (!StringUtils.equals(name.trim(), iprPerson.getName().trim()) || ObjectUtils.notEqual(assoAccountId, iprPerson.getAssoAccountId())) {
                     throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "禁止修改已存在邮箱的相关信息！请前往联系邮箱处");
                 }
                 //邮箱存在
@@ -248,6 +250,7 @@ public class MatchCasePersonService extends ServiceImpl<MatchCasePersonMapper, M
                     queryMatchCasePersonVO.setEmail(iprPerson.getEmail());
                     queryMatchCasePersonVO.setAssoAccountId(iprPerson.getAssoAccountId());
                     queryMatchCasePersonVO.setRemark(iprPerson.getRemark());
+                    queryMatchCasePersonVO.setIsDelete(iprPerson.getIsDelete());
                 }
                 queryMatchCasePersonVOS.add(queryMatchCasePersonVO);
             }