1, graphql返回数据修改,兼容软删除的数据

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitRecordsGraphQLQueryResolver.java

@@ -38,7 +38,10 @@ class VisitRecordsGraphQLQueryResolver implements GraphQLQueryResolver {
     private DmVisitorsConverter visitorsConverter;
 
     public DmVisitRecordsDto visitRecord(Long id) {
-        return  converter.mapperDto(mapper.selectById(id));
+        DmVisitRecordsDto dto = converter.mapperDto(mapper.selectById(id));
+        DmVisitorsPo po = visitorsMapper.selectOneById(dto.getVisitorId());
+        dto.setVisitor(visitorsConverter.mapperDto(po));
+        return  dto;
     }
 
     public List<DmVisitRecordsDto> visitRecords(String receiverName, String receiverPhone, Long visitorId, Integer limit){
@@ -62,7 +65,7 @@ class VisitRecordsGraphQLQueryResolver implements GraphQLQueryResolver {
 
         return mapper.selectList(query).stream().map(
                 t -> {
-                    DmVisitorsPo po = visitorsMapper.selectById(t.getVisitorId());
+                    DmVisitorsPo po = visitorsMapper.selectOneById(t.getVisitorId());
                     DmVisitRecordsDto dto = converter.mapperDto(t);
                     dto.setVisitor(visitorsConverter.mapperDto(po));
                     return dto;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/graphql/VisitorPassRecordsGraphQLQueryResolver.java

@@ -42,7 +42,13 @@ class VisitorPassRecordsGraphQLQueryResolver implements GraphQLQueryResolver {
 
 
     public DmRecognizedRecordsDto visitorPassRecord(Long id) {
-        return  converter.mapperDto(mapper.selectById(id));
+        DmRecognizedRecordsDto recognizedRecordsDto = converter.mapperDto(mapper.selectById(id));
+        DmVisitorsPo po = visitorsMapper.selectOneById(recognizedRecordsDto.getUserId());
+        if  (null != po) {
+            recognizedRecordsDto.setVisitor(visitorsConverter.mapperDto(po));
+            recognizedRecordsDto.setUserName(po.getName());
+        }
+        return recognizedRecordsDto;
     }
 
     public List<DmRecognizedRecordsDto> visitorPassRecords(String userName, Long userId, Integer type, LocalDate startDate, LocalDate endDate, Integer limit){
@@ -72,7 +78,7 @@ class VisitorPassRecordsGraphQLQueryResolver implements GraphQLQueryResolver {
         return mapper.selectList(query).stream().map(t->
         {
             DmRecognizedRecordsDto recognizedRecordsDto = converter.mapperDto(t);
-            DmVisitorsPo po = visitorsMapper.selectById(t.getUserId());
+            DmVisitorsPo po = visitorsMapper.selectOneById(t.getUserId());
             if  (null != po) {
                 recognizedRecordsDto.setVisitor(visitorsConverter.mapperDto(po));
                 recognizedRecordsDto.setUserName(po.getName());

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/mapper/DmVisitorsMapper.java

@@ -16,4 +16,7 @@ public interface DmVisitorsMapper extends BaseMapper<DmVisitorsQuery, DmVisitors
     Long addOne (DmVisitorsPo visitorsPo);
 
     Long updateOne (DmVisitorsPo visitorsPo);
+
+    //软删除也会查询出来
+    DmVisitorsPo selectOneById (Long id);
 }

xueyi-modules/xueyi-system/src/main/resources/graphql/visitor.graphqls

@@ -51,4 +51,5 @@ type Visitor {
     flexVisit:Boolean
     isBlock:Boolean
     resourceId: ID
+    delFlag: Int
 }

xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitorsMapper.xml

@@ -36,4 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where id = #{id}
     </update >
+
+    <select id="selectOneById" parameterType="Long" resultType="com.xueyi.system.api.digitalmans.domain.dto.DmVisitorsDto">
+        select * from dm_visitors where id = #{id}
+    </select>
 </mapper>