bug

src/main/java/com/huiju/estateagents/property/model/Message.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.property.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,6 +27,7 @@ public class Message implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
      * 工单id 非工单不填

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -42,9 +42,6 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
-    @Autowired
-    private UserMapper userMapper;
-
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -108,7 +105,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 校验房产
         hasUserVerify(userElement, userVerify, true);
 
-        User user = userMapper.selectById(userElement.getUserId());
+        TaUser user = taUserMapper.selectById(userElement.getUserId());
 
 
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
@@ -162,7 +159,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private void hasUserVerify(TaUser userElement, TaUserVerify userVerify, boolean hasOwner){
         TaUserVerify hasUserVerify = null;
         // 校验这个房产有没有业主，只能存在一个业主
-        if (hasOwner && userVerify.getRoleId().intValue() == 1 && "1".equals(userVerify.getVerifyStatus())) {
+        if (hasOwner && "1".equals(userVerify.getVerifyStatus())) {
             hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), userVerify.getPhaseId(),
                     userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId());
@@ -187,7 +184,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
      * @param userVerify 审核数据
      * @return TpBuildingOwnerInfo
      */
-    private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, User user) {
+    private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, TaUser user) {
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         TpPhase tpPhase = tpPhaseMapper.selectById(userVerify.getPhaseId());
         TpBuilding tpBuilding = tpBuildingMapper.selectById(userVerify.getBuildingId());
@@ -213,7 +210,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         tpBuildingOwnerInfo.setPairStatus("1");
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        tpBuildingOwnerInfo.setCreateUser(user.getId());
+        tpBuildingOwnerInfo.setCreateUser(user.getUserId());
         tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
@@ -241,7 +238,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 被审核的用户(APP端)
 //        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         // 物业人员
-        User user = userMapper.selectById(userElement.getUserId());
+        TaUser user = taUserMapper.selectById(userElement.getUserId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(),
                 userVerify.getBuildingId(), userVerify.getUnitId(),
                 userVerify.getLevelId(), userVerify.getRoomNoId(),