Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

@@ -99,9 +99,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private MessageMapper messageMapper;
 
-    @Autowired
-    private TpTransactionMapper tpTransactionMapper;
-
     @Autowired
     private TaPersonMapper taPersonMapper;
     
@@ -122,6 +119,16 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 分页查询
         List<TpBuildingOwnerInfo> list = tpBuildingOwnerInfoMapper.selectListByParams(page,tpBuildingOwnerInfo);
+        list.forEach(e -> {
+            TaUserVerify taUserVerify = taUserVerifyMapper.selectById(e.getUserVerifyId());
+            if (null != taUserVerify){
+                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
+                if (null != taSysRole){
+                    e.setRoleName(taSysRole.getDescription());
+                }
+            }
+
+        });
 
         Map<String, Object> retMap = Maps.newHashMap();
 
@@ -866,7 +873,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             taUserVerifyMapper.deleteById(e);
 
             // 作废话题
-            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");
+//            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");
 
         });