From ee2515e1d7ff7efd34d42462b206e9f41e3efde8 Mon Sep 17 00:00:00 2001
From: JyuHsin <729757837@qq.com>
Date: Wed, 14 May 2025 11:45:13 +0800
Subject: [PATCH] commit

---
 .../activity/controller/site/SiteReserveController.java   | 2 ++
 .../mobile/activity/site/SiteInfoMobileController.java    | 2 +-
 src/main/resources/views/mobile/activity/site/info.html   | 8 ++++----
 .../views/platform/activity/site/SiteReserve.html         | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
index a7ab966..0088a9d 100644
--- a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
+++ b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
@@ -29,6 +29,7 @@ import org.nutz.dao.Sqls;
 import org.nutz.dao.entity.Record;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.json.Json;
@@ -244,6 +245,7 @@ public class SiteReserveController {
         if (StrUtil.isNotBlank(siteType)) {
             cnd.and("typeId", "=", siteType);
         }
+        cnd.and(new Static(" 1=1 order by field(asi.reserveTarget, 2, 1, 3)"));
         sql.setCondition(cnd);
         return siteInfoService.list(sql);
     }
diff --git a/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java b/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
index d5a302a..7f0b502 100644
--- a/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
+++ b/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
@@ -110,7 +110,7 @@ public class SiteInfoMobileController {
         if (StrUtil.isNotBlank(typeId)) {
             cnd.andEX("info.typeId", "=", typeId);
         }
-        cnd.groupBy("info.id");
+        cnd.and(new Static(" 1=1 group by info.id order by field(info.reserveTarget, 2, 1, 3)"));
 
         sql.setCondition(cnd);
 
diff --git a/src/main/resources/views/mobile/activity/site/info.html b/src/main/resources/views/mobile/activity/site/info.html
index 63f0082..e171d17 100644
--- a/src/main/resources/views/mobile/activity/site/info.html
+++ b/src/main/resources/views/mobile/activity/site/info.html
@@ -243,9 +243,9 @@ layout("/mobile/platform.html"){
                         </div>
                         <div>
                             <span>面向对象：</span>
-                            <span v-if="o.reservetarget == 1">面向分工会</span>
-                            <span v-if="o.reservetarget == 2">面向个人</span>
-                            <span v-if="o.reservetarget == 3">面向集体</span>
+                            <span v-if="o.reservetarget == 1">分工会</span>
+                            <span v-if="o.reservetarget == 2">个人</span>
+                            <span v-if="o.reservetarget == 3">集体</span>
                         </div>
                         <div>
                             <span>场地介绍：</span>
@@ -291,7 +291,7 @@ layout("/mobile/platform.html"){
                 this.show = true
             },
             openView(o) {
-                if(o.reservetarget === 1 && "${@shiro.hasRole('H04')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
+                if(o.reservetarget === 1 && "${@shiro.hasRole('gh01')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
                     vant.Toast('该场地只能分工会主席预约')
                     return
                 }
diff --git a/src/main/resources/views/platform/activity/site/SiteReserve.html b/src/main/resources/views/platform/activity/site/SiteReserve.html
index 5e71e81..4753f47 100644
--- a/src/main/resources/views/platform/activity/site/SiteReserve.html
+++ b/src/main/resources/views/platform/activity/site/SiteReserve.html
@@ -134,9 +134,9 @@ layout("/layouts/platform.html"){
                                         </div>
                                         <div class="text e-item">
                                             <span style="color: gray">面向对象：</span>
-                                            <span v-if="item.reservetarget == 1">面向分工会</span>
-                                            <span v-if="item.reservetarget == 2">面向个人</span>
-                                            <span v-if="item.reservetarget == 3">面向集体</span>
+                                            <span v-if="item.reservetarget == 1">分工会</span>
+                                            <span v-if="item.reservetarget == 2">个人</span>
+                                            <span v-if="item.reservetarget == 3">集体</span>
                                         </div>
                                         <div class="text e-item">
                                             <span style="color: gray">场地介绍：</span>
@@ -506,7 +506,7 @@ layout("/layouts/platform.html"){
                 this.formData.end_time = ''
             },
             onReserve(data) {
-                if(data.reservetarget === 1 && "${@shiro.hasRole('H04')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
+                if(data.reservetarget === 1 && "${@shiro.hasRole('gh01')}" === 'false' && "${@shiro.hasRole('sysadmin')}" === 'false') {
                     this.$message.warning('该场地只能分工会主席预约')
                     return
                 }