diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java index e326164..024dc60 100644 --- a/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java +++ b/src/main/java/io/v/nutz/activity/controller/site/SiteReviewController.java @@ -113,17 +113,18 @@ public class SiteReviewController { List 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); diff --git a/src/main/java/io/v/nutz/trainSignUp/models/TrainSignUpCourse.java b/src/main/java/io/v/nutz/trainSignUp/models/TrainSignUpCourse.java index b8107b3..0d9663e 100644 --- a/src/main/java/io/v/nutz/trainSignUp/models/TrainSignUpCourse.java +++ b/src/main/java/io/v/nutz/trainSignUp/models/TrainSignUpCourse.java @@ -62,7 +62,7 @@ public class TrainSignUpCourse extends BaseModel implements Serializable { private List courseLocationCoordinates; @Column - @ColDefine(type = ColType.VARCHAR, width = 20) + @ColDefine(type = ColType.VARCHAR, width = 50) @Comment("课程讲师") private String courseInstructor; diff --git a/src/main/resources/views/mobile/activity/site/audit.html b/src/main/resources/views/mobile/activity/site/audit.html index 79e3727..a8d511b 100644 --- a/src/main/resources/views/mobile/activity/site/audit.html +++ b/src/main/resources/views/mobile/activity/site/audit.html @@ -324,9 +324,9 @@ layout("/mobile/platform.html"){
{{getTime(item, d)}}
-
+
预约事由:{{item.reserve_cause}}
diff --git a/src/main/resources/views/mobile/train/trainInfo.html b/src/main/resources/views/mobile/train/trainInfo.html index 041ce03..db50197 100644 --- a/src/main/resources/views/mobile/train/trainInfo.html +++ b/src/main/resources/views/mobile/train/trainInfo.html @@ -197,11 +197,11 @@ layout("/mobile/platform.html"){ 地  点: {{o.courseLocation}}
-
+
联 系 人: {{o.courseInstructor}}
-
+
时  间: 点我查看 @@ -735,7 +735,7 @@ layout("/mobile/platform.html"){ this.getActivity() this.closeLoading() - await wxScannerQrCode.initWxConfig(window.location.href) + //await wxScannerQrCode.initWxConfig(window.location.href) }, }) diff --git a/src/main/resources/views/platform/trainSingUp/manage/include_activity_edit.html b/src/main/resources/views/platform/trainSingUp/manage/include_activity_edit.html index 86ae231..28714c4 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/include_activity_edit.html +++ b/src/main/resources/views/platform/trainSingUp/manage/include_activity_edit.html @@ -86,7 +86,7 @@
-