bug

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

@@ -158,6 +158,8 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Map<String, Object> map = Maps.newHashMap();
         map.put("list",list);
         map.put("total",page.getTotal());
+        map.put("pageNum", page.getCurrent());
+        map.put("pageSize", page.getSize());
         responseBean.addSuccess(map);
         return responseBean;
     }

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.common.base.messagePush;
@@ -17,6 +19,7 @@ import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +48,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
@@ -292,8 +298,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUserVerify taUserVerify = taUserVerifyMapper.selectById(userVerifyId);
-        TaUser currentUser = taUserMapper.selectById(taUserVerify.getPersonId());
-        taUserVerify.setLoginName(currentUser.getLoginName());
+        TaPerson currentUser = taPersonMapper.selectById(taUserVerify.getPersonId());
+        taUserVerify.setLoginName(currentUser.getName());
 
         // 开始查询 业主
         TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());