|
@@ -42,9 +42,6 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
42
|
42
|
@Autowired
|
43
|
43
|
private TaUserVerifyMapper taUserVerifyMapper;
|
44
|
44
|
|
45
|
|
- @Autowired
|
46
|
|
- private UserMapper userMapper;
|
47
|
|
-
|
48
|
45
|
@Autowired
|
49
|
46
|
private TaUserMapper taUserMapper;
|
50
|
47
|
|
|
@@ -108,7 +105,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
108
|
105
|
// 校验房产
|
109
|
106
|
hasUserVerify(userElement, userVerify, true);
|
110
|
107
|
|
111
|
|
- User user = userMapper.selectById(userElement.getUserId());
|
|
108
|
+ TaUser user = taUserMapper.selectById(userElement.getUserId());
|
112
|
109
|
|
113
|
110
|
|
114
|
111
|
// TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
|
|
@@ -162,7 +159,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
162
|
159
|
private void hasUserVerify(TaUser userElement, TaUserVerify userVerify, boolean hasOwner){
|
163
|
160
|
TaUserVerify hasUserVerify = null;
|
164
|
161
|
// 校验这个房产有没有业主,只能存在一个业主
|
165
|
|
- if (hasOwner && userVerify.getRoleId().intValue() == 1 && "1".equals(userVerify.getVerifyStatus())) {
|
|
162
|
+ if (hasOwner && "1".equals(userVerify.getVerifyStatus())) {
|
166
|
163
|
hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), userVerify.getPhaseId(),
|
167
|
164
|
userVerify.getBuildingId(), userVerify.getUnitId(),
|
168
|
165
|
userVerify.getLevelId(), userVerify.getRoomNoId());
|
|
@@ -187,7 +184,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
187
|
184
|
* @param userVerify 审核数据
|
188
|
185
|
* @return TpBuildingOwnerInfo
|
189
|
186
|
*/
|
190
|
|
- private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, User user) {
|
|
187
|
+ private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, TaUser user) {
|
191
|
188
|
// TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
|
192
|
189
|
TpPhase tpPhase = tpPhaseMapper.selectById(userVerify.getPhaseId());
|
193
|
190
|
TpBuilding tpBuilding = tpBuildingMapper.selectById(userVerify.getBuildingId());
|
|
@@ -213,7 +210,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
213
|
210
|
tpBuildingOwnerInfo.setPairStatus("1");
|
214
|
211
|
tpBuildingOwnerInfo.setVerifyStatus("1");
|
215
|
212
|
tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
|
216
|
|
- tpBuildingOwnerInfo.setCreateUser(user.getId());
|
|
213
|
+ tpBuildingOwnerInfo.setCreateUser(user.getUserId());
|
217
|
214
|
tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
|
218
|
215
|
|
219
|
216
|
tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
|
|
@@ -241,7 +238,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
|
241
|
238
|
// 被审核的用户(APP端)
|
242
|
239
|
// TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
|
243
|
240
|
// 物业人员
|
244
|
|
- User user = userMapper.selectById(userElement.getUserId());
|
|
241
|
+ TaUser user = taUserMapper.selectById(userElement.getUserId());
|
245
|
242
|
TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getOrgId(), userVerify.getPhaseId(),
|
246
|
243
|
userVerify.getBuildingId(), userVerify.getUnitId(),
|
247
|
244
|
userVerify.getLevelId(), userVerify.getRoomNoId(),
|