commit

src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java

@@ -113,17 +113,18 @@ public class SiteReviewController {
         List<String> stateList = sList.stream().map(o -> o.getString("stateId")).collect(Collectors.toList());
 
         if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) {
-            if (isAudit == null) {
-                SqlExpressionGroup group = new SqlExpressionGroup();
-                group.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"))
-                        .or("reserve_state", "in", stateList);
-                cnd.and(group);
-            } else if (isAudit) {
-                //查询已审核
-                cnd.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"));
-            } else {
-                cnd.and("reserve_state", "in", stateList);
-            }
+
+        }
+        if (isAudit == null) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"))
+                    .or("reserve_state", "in", stateList);
+            cnd.and(group);
+        } else if (isAudit) {
+            //查询已审核
+            cnd.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"));
+        } else {
+            cnd.and("reserve_state", "in", stateList);
         }
         if (Strings.isNotBlank(siteType)) {
             cnd.and("asi.typeId", "=", siteType);

src/main/java/io/v/nutz/trainSignUp/models/TrainSignUpCourse.java

@@ -62,7 +62,7 @@ public class TrainSignUpCourse extends BaseModel implements Serializable {
     private List<Double> courseLocationCoordinates;
 
     @Column
-    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @ColDefine(type = ColType.VARCHAR, width = 50)
     @Comment("课程讲师")
     private String courseInstructor;
 

src/main/resources/views/mobile/activity/site/audit.html

@@ -324,9 +324,9 @@ layout("/mobile/platform.html"){
                             <div v-for="(d,index) in item.concat_day.split(',')">{{getTime(item, d)}}</div>
                         </div>
                     </div>
-                    <div style="width: 94%;">
+                    <!--<div style="width: 94%;">
                         <span style="color: grey">参加人员：</span><span>{{item.joinUser}}</span>
-                    </div>
+                    </div>-->
                     <div style="width: 94%;">
                         <span style="color: grey">预约事由：</span><span>{{item.reserve_cause}}</span>
                     </div>

src/main/resources/views/mobile/train/trainInfo.html

@@ -197,11 +197,11 @@ layout("/mobile/platform.html"){
                         <span class="train-title" v-else>地&emsp;&emsp;点：</span>
                         <span>{{o.courseLocation}}</span>
                     </div>
-                    <div>
+                    <div v-if="activity.id !== '69d7e3a952784b328b911b60cee08b14'">
                         <span class="train-title">联&ensp;系&ensp;人：</span>
                         <span>{{o.courseInstructor}}</span>
                     </div>
-                    <div>
+                    <div v-if="activity.addressName!='上车'">
                         <span class="train-title">时&emsp;&emsp;间：</span>
                         <span v-if="o.courseTimeList && o.courseTimeList.length > 1" @click="trainClick(o)"
                               style="color: #1867b0">点我查看</span>
@@ -735,7 +735,7 @@ layout("/mobile/platform.html"){
             this.getActivity()
             this.closeLoading()
 
-            await wxScannerQrCode.initWxConfig(window.location.href)
+            //await wxScannerQrCode.initWxConfig(window.location.href)
         },
     })
 </script>

src/main/resources/views/platform/trainSingUp/manage/include_activity_edit.html

@@ -86,7 +86,7 @@
             <el-form-item label="面向对象" prop="joinCnd">
                 <div style="display: flex; justify-content: space-between">
                     <div style="width: 99%">
-                        <el-select @change="changeActivity" clearable filterable placeholder="请选择可报名人员范围"
+                        <el-select  clearable filterable placeholder="请选择可报名人员范围"
                                    style="width: 99%" v-model="formData.activityGroupId">
                             <el-option :key="item.groupId"
                                        :label="item.groupName"