傅行帆 4 lat temu
rodzic
commit
0057178aa5

+ 1
- 0
src/main/java/com/huiju/estateagents/center/taUser/controller/TpLifeConsultantEvaluateController.java Wyświetl plik

@@ -98,6 +98,7 @@ public class TpLifeConsultantEvaluateController extends BaseController {
98 98
             queryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,tpLifeConsultantEvaluate.getOrgId());
99 99
             queryWrapper.eq(TpLifeConsultantEvaluate::getPersonId,tpLifeConsultantEvaluate.getPersonId());
100 100
             queryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,tpLifeConsultantEvaluate.getEvaluateTime());
101
+            queryWrapper.eq(TpLifeConsultantEvaluate::getUserId,tpLifeConsultantEvaluate.getUserId());
101 102
             List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(queryWrapper);
102 103
             if (list.size() > 0){
103 104
                 responseBean.addError("你当月已经投票了");

+ 10
- 2
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java Wyświetl plik

@@ -589,7 +589,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
589 589
 //            }
590 590
             // 当前提单人的相关信息
591 591
             LambdaQueryWrapper<TaUserVerify> lambdaQueryWrapper = new LambdaQueryWrapper<TaUserVerify>();
592
-            lambdaQueryWrapper.eq(TaUserVerify::getPersonId,tpTicketVO.getPersonId());
592
+            lambdaQueryWrapper.eq(TaUserVerify::getPersonId,e.getPersonId());
593 593
             lambdaQueryWrapper.eq(TaUserVerify::getVerifyStatus,"1");
594 594
             List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectList(lambdaQueryWrapper);
595 595
             tpTicketVO.setUserVerifyList(taUserVerifies);
@@ -1133,6 +1133,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
1133 1133
         tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
1134 1134
         tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
1135 1135
         IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
1136
-        return ResponseBean.success(tpTicketIPage);
1136
+        List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
1137
+
1138
+        List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
1139
+        tpTicketVOConvert(tpTicketList, tpTicketVOList);
1140
+        Map<String, Object> map = Maps.newHashMap();
1141
+        map.put("pagelist", tpTicketVOList);
1142
+        map.put("total", page.getTotal());
1143
+
1144
+        return ResponseBean.success(map);
1137 1145
     }
1138 1146
 }