电子信息牌bug修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -107,7 +107,7 @@ public class LabXxpInspectionController extends BaseController
      * @param xxpInspection
      * @return
      */
-    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.QUERY)
     @GetMapping("/listStandard")
     @ApiOperation(value = "查询巡查列表-正常")
     public TableDataInfo<XxpInspection> listStandard(XxpInspection xxpInspection)
@@ -119,11 +119,11 @@ public class LabXxpInspectionController extends BaseController
 
 
     /***
-     * 签到列表-正常
+     * 签到列表-异常
      * @param xxpDuty
      * @return
      */
-    // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_XXP_INSPECTION + PerFun.QUERY)
     @GetMapping("/listAbnormal")
     @ApiOperation(value = "查询巡查列表-异常")
     public TableDataInfo<XxpDuty> listAbnormal(XxpDuty xxpDuty)

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpClassifyDetailMapper.xml

@@ -58,7 +58,7 @@
                 and t.create_time <= str_to_date(#{endTime}, '%Y-%m-%d')
             </if>
         </where>
-        <if test="remark =='list' "> order by isnull(sort),sort,is_collective desc ,create_time desc</if>
+        <if test="remark =='list' "> order by isnull(sort),sort,is_collective,create_time desc</if>
     </select>
 
     <select id="selectXxpClassifyDetailedById" resultMap="XxpClassifyDetailedResult">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpClassifyMapper.xml

@@ -62,7 +62,9 @@
             order by t.create_time desc
         </if>
         <if test="remark == 'sort' ">
-            order by isnull(t.sort) ,t.sort
+            order by isnull(t.sort),t.sort,
+            t.is_show,
+            t.create_time desc
         </if>
     </select>