commit

src/main/java/io/v/nutz/activity/controller/union/ActivityUnionUserStatisticsController.java

@@ -1,7 +1,9 @@
 package io.v.nutz.activity.controller.union;
 
 import cn.hutool.core.util.StrUtil;
+import cn.wizzer.framework.base.Result;
 import io.v.nutz.activity.models.ActivityTissue;
+import io.v.nutz.activity.models.ActivityTissuePerson;
 import io.v.nutz.annontation.ViReturn;
 import io.v.nutz.base.service.BaseService;
 import io.v.nutz.base.utils.Vi;
@@ -139,4 +141,13 @@ public class ActivityUnionUserStatisticsController {
     }
 
 
+    @At
+    @ViReturn
+    @RequiresPermissions(value = {"activity.school.user.statistics", "activity.club.user.statistics", "activity.union.user.statistics"}, logical = Logical.OR)
+    public Object doSingleCancelRegister(String id){
+        baseService.dao().delete(ActivityTissuePerson.class,id);
+        return Result.success().addMsg("取消成功！");
+    }
+
+
 }

src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java

@@ -42,7 +42,8 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
         //请求ip地址
 //        String requestIp = Lang.getIP(Mvcs.getReq());
 
-        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "zxcvbnmmnbvcxz");
+//        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1");
+        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "@dd3s#3618!");
 
 //        String universalLoginIp = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "UniversalLoginIp"))).map(v -> v.getConfigValue()).orElse("0.0.0.0");
         if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {

src/main/resources/views/mobile/activity/unionActivity/common/initMap.js

@@ -6,7 +6,6 @@ const self_mixin_h5 = {
             unionId: null,
             unionLimitNum: 0,
             isRegisterFull: false,
-            user: JSON.parse(window.sessionStorage.getItem('user'))
         }
     },
     methods: {
@@ -16,7 +15,7 @@ const self_mixin_h5 = {
                 resp.data.location = JSON.parse(resp.data.location)
                 resp.data.unionUserNumberLimit = JSON.parse(resp.data.unionUserNumberLimit)
                 this.o = resp.data
-                this.unionId = this.user.union.id
+                this.unionId = "${@shiro.getPrincipalProperty('unit').getUnionid()}"
                 if (!this.unionId) {
                     this.$toast.fail('您的所属工会信息缺失，请联系管理员')
                     return

src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html

@@ -143,9 +143,7 @@
         methods: {
             doDelete(row) {
                 this.$confirm('您确认要取消报名吗?', '提示', {type: 'warning'}).then(async () => {
-                    const resp = await $.post('/mobile/activity/unionActivity/doSingleCancelRegister', {
+                    const resp = await $.post('/platform/activity/user/statistics/doSingleCancelRegister', {
-                        activityId: this.pageForm.activityId,
-                        applyUserId: row.applyUserId,
                         id: row.atpId
                     })
                     if (resp.code === 0) {