uniapp历史报错 修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MValveWellPositionController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
@@ -45,10 +46,9 @@ public class MValveWellPositionController extends BaseController {
      */
     @ApiOperation("查询阀井位置列表")
     @GetMapping("/list")
-    public AjaxResult<?> list(@Validated(QueryGroup.class) GValveWellPositionBo bo) {
-        return AjaxResult.success(iGValveWellPositionService.queryPageList(bo).getRows());
+    public AjaxResult list(@Validated(QueryGroup.class) GValveWellPositionBo bo) {
+        return AjaxResult.success(iGValveWellPositionService.queryPageList(bo));
     }
-
     /**
      * 导出阀井位置列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GCourtyardNetworkManagementServiceImpl.java

@@ -116,29 +116,31 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
         Page<GCourtyardNetworkManagementVo> list = baseMapper.getList(bo, page);
         list.getRecords().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamServiceImpl.java

@@ -116,29 +116,31 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         result.getRecordsVo().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
 
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -113,31 +113,33 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         PagePlus<GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         result.getRecordsVo().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
-
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+//            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxServiceImpl.java

@@ -116,29 +116,31 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         Page<GRegulatorBoxVo> result = baseMapper.getList(bo, page);
         result.getRecords().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -56,29 +56,31 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
 //            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
 
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellInspectionServiceImpl.java

@@ -118,29 +118,31 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
         Page<GValveWellInspectionVos> list = baseMapper.getList(bo, page);
         list.getRecords().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            //按照顺序审核
-            //未审核过队长先展示
-            List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
-            if (ObjectUtils.isEmpty(listed)){
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    item.setFlag(true);
+            if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
+                //按照顺序审核
+                //未审核过队长先展示
+                List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
+                if (ObjectUtils.isEmpty(listed)){
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        item.setFlag(true);
+                    }
                 }
-            }
-            else {
-                String regex = "^(xx|XX).{2}";
-                if (bo.getPostNameArias().matches(regex)){
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
-                }else {
-                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
-                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
-                    if ("-1".equals(item.getProcessStatus())){
-                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
-                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                else {
+                    String regex = "^(xx|XX).{2}";
+                    if (bo.getPostNameArias().matches(regex)){
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    }else {
+                        if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                        if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                        if ("-1".equals(item.getProcessStatus())){
+                            if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                            if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
+                        }
                     }
                 }
             }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellPositionServiceImpl.java

@@ -116,7 +116,6 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
         lqw.like(StringUtils.isNotBlank(bo.getPosition()), GValveWellPosition::getPosition, bo.getPosition());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GValveWellPosition::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GValveWellPosition::getLatitude, bo.getLatitude());
-        lqw.orderByDesc(GValveWellPosition::getCreateTime);
         if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
             lqw.ge(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(0));
             lqw.le(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(1));
@@ -129,6 +128,7 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
                 lqw.notIn(GValveWellPosition::getId,ids);
             }
         }
+        lqw.orderByDesc(GValveWellPosition::getCreateTime);
         return lqw;
     }
 

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -45,16 +45,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
     <select id="getArea" resultType="com.ruoyi.gas.domain.vo.GAreaVo">
-        select id   as id,
-               name as name
-        from g_area
-        where del_flag = '0'
+        SELECT
+        a.*
+        FROM
+        g_area as a join g_network_relation as b on a.id = b.regulator_box_id AND b.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            and b.user_id like CONCAT('%',#{userId},'%')
+        </if>
+        where a.del_flag = 0
 
         <if test="name != null  and name != ''">
-            and name like CONCAT('%',#{name},'%')
-        </if>
-        <if test="userId != null and userId != ''">
-            and user_id like CONCAT('%',#{userId},'%')
+            and a.name like CONCAT('%',#{name},'%')
         </if>
 
     </select>

ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -45,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.ranks != null and p.ranks != ''">
                 and u.ranks = #{p.ranks}
             </if>
-            <if test="p.areaId != null and p.areaId != ''">
-                and c.area_id = #{p.areaId}
+            <if test="p.areaName != null and p.areaName != ''">
+                and d.name LIKE concat('%', #{p.areaName}, '%')
             </if>
             <if test="p.createTimes != null and p.createTimes.size() > 1">
                 and a.create_time BETWEEN #{p.createTimes[0]} and #{p.createTimes[1]}

ruoyi-mobile/src/main/resources/mapper/mobile/MUserMapper.xml

@@ -20,7 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="search1" resultType="java.util.Map">
         SELECT a.id AS id,
         a.engin_name AS name,
-        a.create_time AS time
+        a.create_time AS time,
+        a.process_status as processStatus
         FROM
         g_emergency_repair a
         WHERE a.del_flag = 0
@@ -36,9 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         a.id AS id,
         a.name AS name,
-        a.create_time AS time
+        a.create_time AS time,
+        a.process_status as processStatus
         FROM
         g_regulator_box a WHERE a.del_flag =0
+        <if test="p.value != null  and p.value != ''">
+            AND a.name = #{p.value}
+        </if>
         <if test="p.userId != null  and p.userId != ''">
             AND a.create_by = #{p.userId}
         </if>
@@ -51,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         a.id AS id,
         concat(ar.name,'-',bu.name) AS name,
-        a.create_time AS time
+        a.create_time AS time,
+        a.process_status as processStatus
         FROM
         g_courtyard_network_management a
         LEFT JOIN g_building bu on bu.id = a.building_id
@@ -69,7 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         a.id AS id,
         wa.name AS name,
-        a.create_time AS time
+        a.create_time AS time,
+        a.process_status as processStatus
         FROM
         g_patrol_record a
         LEFT JOIN g_warning_pile wa on wa.id = a.warning_pile_id