修复 bug

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

@@ -229,10 +229,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         bill.setPayedNum(0);
         bill.setBillStatus(billStatus);
-        bill.setCreateUser(userElement.getId());
         //为草稿时不创建时间
         if(!"2".equals(billStatus)) {
             bill.setCreateDate(new Date());
+            bill.setCreateUser(userElement.getId());
         }
         bill.setCommunityId(userElement.getCommunityId());
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
@@ -250,6 +250,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         if (billId != null) {
             bill.setCreateUser(null);
             bill.setCreateDate(null);
+            if(!"2".equals(billStatus)) {
+                bill.setCreateDate(new Date());
+                bill.setCreateUser(userElement.getId());
+            }
             // 设置主键, 表示修改
             bill.setId(billId);
         }
@@ -500,7 +504,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Integer pageSize = 10;
         Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
         // 分页查询
-        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, new QueryWrapper<>());
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
+        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
         List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
         // 总页数
         Long pages = infoIPage.getPages();
@@ -534,7 +540,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             if (index == records.size()) {
                 index = 0;
                 page = new Page(infoIPage.getCurrent() + 1,pageSize);
-                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, new QueryWrapper<>());
+                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
                 records = infoIPage.getRecords();
             }
         } while (infoIPage.getCurrent() <= pages);