合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -142,8 +142,9 @@ public class BuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="ownerName:姓名,ownerTel:手机号 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
 
     @RequestMapping(value="/userPassCertification",method = RequestMethod.POST)
-    public ResponseBean userPassCertification(@RequestBody String paramets){
-        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets);
+    public ResponseBean userPassCertification(@RequestBody String paramets,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets,userElement.getCommunityId());
         return allApprove;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -24,7 +24,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      * @param
      * @return
      */
-    IPage<TpBuildingOwnerInfo> selectUserApprove(Page page ,@Param("ownerName") String r , @Param("ownerTel") String ownerTel, @Param("VerifyStatus") String VerifyStatus );
+    IPage<TpBuildingOwnerInfo> selectUserApprove(Page page ,@Param("ownerName") String r , @Param("ownerTel") String ownerTel, @Param("VerifyStatus") String VerifyStatus,@Param("CommunityId")Integer CommunityId);
     
     int batchInsert(List<TpBuildingOwnerInfo> list);
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBuildingOwnerInfoService.java

@@ -22,7 +22,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param paramets
      * @return
      */
-    ResponseBean selectUserApprove(String paramets);
+    ResponseBean selectUserApprove(String paramets,Integer CommunityId);
     /**
      * 根据条件查询
      * @param parameter

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -534,7 +534,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean selectUserApprove(String paramets) {
+    public ResponseBean selectUserApprove(String paramets,Integer CommunityId) {
 
         ResponseBean responseBean = new ResponseBean();
 
@@ -548,7 +548,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TpBuildingOwnerInfo> ownerInfoIPage = tpBuildingOwnerInfoMapper.selectUserApprove(page, tpBuildingOwnerInfo.getOwnerName(),tpBuildingOwnerInfo.getOwnerTel(),tpBuildingOwnerInfo.getVerifyStatus());
+        IPage<TpBuildingOwnerInfo> ownerInfoIPage = tpBuildingOwnerInfoMapper.selectUserApprove(page, tpBuildingOwnerInfo.getOwnerName(),tpBuildingOwnerInfo.getOwnerTel(),tpBuildingOwnerInfo.getVerifyStatus(),CommunityId);
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("list", ownerInfoIPage.getRecords());

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -30,6 +30,7 @@
                 AND  verify_status = #{VerifyStatus,jdbcType=VARCHAR}
             </if>
             and tp_building_owner_info.pair_status=1
+            and community_id=#{CommunityId,jdbcType=INTEGER}
         </where>
     </select>
 

VUECODE/smart-property-manage/src/views/owner/index.vue

@@ -39,12 +39,12 @@
         <template slot-scope="scope">{{ scope.row.building + scope.row.unit + scope.row.level + scope.row.roomNo }}</template>
       </el-table-column>
       <!-- <el-table-column prop="createDate" label="创建时间" width="540" align="center" /> -->
-      <el-table-column label="录入时间" align="center">
+      <el-table-column label="创建时间" align="center" width="600">
         <template slot-scope="scope">
           <span>{{ formatDate(scope.row.createDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="认证状态" width="500" align="center">
+      <el-table-column label="认证状态" width="440" align="center">
         <template slot-scope="scope">{{ scope.row.verifyStatus =='1' ? '已认证通过':'已停用' }}</template>
       </el-table-column>
       <!-- <el-table-column label="操作" width="250">
@@ -131,8 +131,8 @@ export default {
       this.$store.dispatch('UserPassCertification', this.listQuery).then((res) => {
         const resData = res.data
         this.userPassCertification = resData.list
-        this.listQuery.pageNum = resData.pageNum
-        this.listQuery.pageSize = resData.pageSize
+        this.listQuery.pageNum = 1
+        this.listQuery.pageSize = 10
         this.total = resData.total
         this.listLoading = false
       }).catch(() => {