server_commit

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java

@@ -414,8 +414,8 @@ public class ActivityApplyController {
             apply.setActivityUnionName(basicUnion.getUnionname());
             apply.setApplyUnitId(basicUnit.getId());
 
-//            dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()),
+            dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()),
-//                    Cnd.where("id", "=", apply.getUserId()));
+                    Cnd.where("id", "=", apply.getUserId()));
         }
         activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies));
         return null;
@@ -707,7 +707,7 @@ public class ActivityApplyController {
                                     @Param(value = "LeaderData", required = false) ActivitySchoolApply LeaderData,
                                     @Param(value = "CoachData", required = false) ActivitySchoolApply CoachData,
                                     @Param(value = "headData", required = false) ActivitySchoolApply headData,
-                                    @Param(value = "headData") String activityId) {
+                                    @Param(value = "activityId") String activityId) {
         ActivityBasicUnit thisBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=",ShiroUtil.getUnitId()));
         ActivityBasicUnion thisBasicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", thisBasicUnit.getUnionid()));
         Cnd cnd = Cnd.NEW();

src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
+import cn.hutool.core.util.StrUtil;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
@@ -304,7 +305,7 @@ public class ActivityCommonController {
                 	LEFT JOIN activity_event ev ON ev.id = app.eventId
                 	LEFT JOIN activity_school sc ON sc.id=app.activityId
                 WHERE
-                	activityId = @id and ev.allName is not null
+                	activityId = @id 
                 	and app.status=2
                 	$cnd
                 ORDER BY
@@ -326,6 +327,9 @@ public class ActivityCommonController {
             List<String> identity = Json.fromJsonAsList(String.class, z.getString("identity"));
             String s = identity.stream().map(personType::getName).collect(Collectors.toList()).toString();
             z.addv("sf", s.replaceAll("[\\[\\]]", ""));
+            if (StrUtil.isBlank(z.getString("allName"))) {
+                z.addv("allName", s.replaceAll("[\\[\\]]", ""));
+            }
         });
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
 //        exportEntities.add(new ExcelExportEntity("小队名称", "team", 20));
@@ -351,7 +355,7 @@ public class ActivityCommonController {
         });
 
         try {
-            ViTool.excelResponse(response,  activityName+"报名表.xlsx");
+            ViTool.excelResponse(response, activityName + "报名表.xlsx");
             ServletOutputStream outputStream = response.getOutputStream();
             workbook.write(outputStream);
             outputStream.close();
@@ -366,7 +370,8 @@ public class ActivityCommonController {
         private static String getName(String v) {
             switch (v) {
                 case "1":
-                    return "运动员";
+//                    return "运动员";
+                    return "";
                 case "2":
                     return "教练";
                 case "3":

src/main/resources/static/components/syr/SyrInfoNew.vue

@@ -165,7 +165,7 @@
       </el-card>
     </el-tab-pane>
 
-    <!--# if(@shiro.hasRole('superadmin') || @shiro.hasRole('A06')){ #-->
+    <!--# if(@shiro.hasRole('superadmin') || @shiro.hasRole('SchoolUnionAdmin')){ #-->
     <el-tab-pane v-if="kt.jbxx.state>=40 && showPaneBeforePwJtPs" label="评委立项评审信息" name="4">
       <div>
         <el-card shadow="never">
@@ -571,7 +571,7 @@
       </el-card>
     </el-tab-pane>
 
-    <!--# if(@shiro.hasRole('superadmin') || @shiro.hasRole('A06')){ #-->
+    <!--# if(@shiro.hasRole('superadmin') || @shiro.hasRole('SchoolUnionAdmin')){ #-->
     <el-tab-pane v-if="kt.jbxx.state>=100 && kt.jbxx.lxresult===1" label="评委结题评审信息"
                  name="10">
       <div>

src/main/resources/static/components/sys/union/cadre/Mange.vue

@@ -257,7 +257,7 @@ module.exports = {
     async created() {
         this.doSearch()
         this.roleOptions = await getDictOptions("GrassrootsCadres")
-        if (!this.$auth.hasRoleOr("sysadmin,A06,wyh01")) {
+        if (!this.$auth.hasRoleOr("sysadmin,SchoolUnionAdmin,wyh01")) {
             this.roleOptions = this.roleOptions.filter((i) => !["gh01", "gh02"].includes(i.code))
         }
         console.log(this.roleOptions)

src/main/resources/views/platform/activity/school/ActivityApply.html

@@ -1214,9 +1214,9 @@ layout("/layouts/platform.html"){
             :close-on-click-modal="false"
             :visible.sync="detailsDialogVisible"
             title="活动通知"
-            width="70%"
+            width="60%"
     >
-        <div v-html="activityData2.eventNotification"></div>
+        <div style="padding: 20px;height: 600px;overflow-y: auto" v-html="activityData2.eventNotification"></div>
         <span class="dialog-footer" slot="footer">
             <el-button @click="detailsDialogVisible = false" type="primary">关 闭</el-button>
         </span>