fix:修复根据用户获取监控对象分页为根据用户所在组织，并修改排序规则

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetPageParam.java

@@ -67,4 +67,10 @@ public class MonitorTargetPageParam {
      */
     @Schema(description = "用户id")
     private String userId;
+
+    /**
+     * 机构id
+     */
+    @Schema(description = "机构id")
+    private String orgId;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -148,15 +148,20 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
             queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
         }
         if (ObjectUtil.isNull(monitorTargetPageParam.getUserId())) {
-            queryWrapper.lambda().eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
+//            queryWrapper.lambda().eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
         } else {
             queryWrapper.lambda().eq(MonitorTarget::getCreateUser, monitorTargetPageParam.getUserId());
         }
+        if (ObjectUtil.isNull(monitorTargetPageParam.getOrgId())) {
+            queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, StpLoginUserUtil.getLoginUser().getOrgId());
+        } else {
+            queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, monitorTargetPageParam.getOrgId());
+        }
         if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());
             queryWrapper.orderBy(true, monitorTargetPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorTargetPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(MonitorTarget::getCreateTime);
+            queryWrapper.lambda().orderByAsc(MonitorTarget::getStatus).orderByDesc(MonitorTarget::getCreateTime);
         }
         queryWrapper.lambda().eq(MonitorTarget::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorTarget> page1 = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());