bug

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -369,8 +369,8 @@ public class BuildingOwnerInfoController extends BaseController {
                                     HttpServletRequest request){
 
         ResponseBean responseBean = new ResponseBean();
-        TaUser userElement = getTaUser(request);
-        responseBean = iBuildingOwnerInfoService.hasBuild(userElement, orgId ,phaseId, buildingId, unitId, levelId, roomNoId);
+        String personId = getPersonId(request);
+        responseBean = iBuildingOwnerInfoService.hasBuild(personId, orgId ,phaseId, buildingId, unitId, levelId, roomNoId);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -109,7 +109,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param verifyStatus
      * @return
      */
-    List<TaUserVerify> selectWxCommunityAndAddress(@Param("userId") Integer userId,
+    List<TaUserVerify> selectWxCommunityAndAddress(@Param("personId") String personId,
                                                  @Param("orgId") Integer orgId,
                                                  @Param("phaseId") Integer phaseId,
                                                  @Param("buildingId") Integer buildingId,

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -180,5 +180,5 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param roomNoId
      * @return
      */
-    ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+    ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 }

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

@@ -1202,10 +1202,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean hasBuild(TaUser userElement, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+    public ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号，审核通过的
-        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
+        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 1);
         // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
         if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
             responseBean.addError("你已关联此房间，无法再次关联！");
@@ -1213,7 +1213,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 1.检验该用户关联有没有这个 户号，待审核
-        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(userElement.getUserId(),userElement.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 0);
+        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 0);
         if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
             responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，再进行下一步操作！");
             return responseBean;

src/main/resources/mapper/property/TaUserVerifyMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TaUserVerifyMapper">
 
     <sql id="Base_Column_List" >
-    id, user_id, org_id, role_id, phase_id, phase_name, building_id, building_name,
+    id, person_id, org_id, role_id, phase_id, phase_name, building_id, building_name,
     unit_id, unit_name, level_id, level_name, room_no_id, room_no_name, verify_status,
     create_date, verify_name, remark
   </sql>
@@ -58,7 +58,7 @@
         and level_id = #{levelId,jdbcType=INTEGER}
         and room_no_id = #{roomNoId,jdbcType=INTEGER}
         and verify_status = 1
-        and user_id = #{userId}
+        and person_id = #{userId}
         and role_id = #{roleId}
     </select>
 
@@ -67,7 +67,7 @@
           *
         from ta_user_verify
         where org_id = #{orgId,jdbcType=INTEGER}
-        and user_id = #{userId,jdbcType=INTEGER}
+        and person_id = #{userId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}
         and unit_id = #{unitId,jdbcType=INTEGER}
@@ -83,7 +83,7 @@
         <include refid="Base_Column_List"/>
         from ta_user_verify
         where org_id = #{orgId,jdbcType=INTEGER}
-        and user_id = #{userId,jdbcType=INTEGER}
+        and person_id = #{personId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}
         and unit_id = #{unitId,jdbcType=INTEGER}