diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 42c88e4..92b5a73 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -2,6 +2,9 @@ package io.v.nutz.base.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import io.v.nutz.base.enums.Env; import io.v.nutz.web.commons.base.Globals; import lombok.extern.slf4j.Slf4j; @@ -83,7 +86,7 @@ public class MsgApi { map.put("imageUrl", imageUrl); map.put("link", link); - /*HttpRequest request = HttpUtil.createPost(MSG_API) + HttpRequest request = HttpUtil.createPost(MSG_API) .header("token", msgToken) .body(Json.toJson(map)); JSONObject jsonObject = JSON.parseObject(request.execute().body()); @@ -94,7 +97,7 @@ public class MsgApi { } else { log.info("发送失败>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); throw new RuntimeException("Message sending failed with status code: " + status + ", Message: " + jsonObject.getString("message")); - }*/ + } } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java index d11c4b4..3e488f4 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubMyApplyController.java @@ -168,7 +168,7 @@ public class ClubMyApplyController { LEFT JOIN sys_user u ON scu.userid = u.id LEFT JOIN sys_unit unit ON u.unitid = unit.id WHERE scu.clubid = @clubid and scu.status in (5, 6) and isNormal = true - ORDER BY FIELD( scu.sf, 1, 3, 4, 5, 2 ),scu.join_time DESC + ORDER BY FIELD( scu.sf, 1, 3, 4, 5, 2 ), scu.status asc, scu.join_time DESC """).setParam("clubid", id))); return result; } diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java index 8b0b92c..7b52aac 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java @@ -77,7 +77,7 @@ public class ClubRegistApplyController { @Param(value = "::managePerson", required = false) List managePerson, @Param(value = "::clubUserList", required = false) List clubUserList) throws IOException { if(!isSave && !sysClubService.getInviteAgree(club)) { - return Result.error("邀请会员中确认人数暂未达到20人"); + return Result.error("您邀请的会员中确认人数暂未达到20人，暂不能提交，只能保存"); } club.setIsjs(false); if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { @@ -118,6 +118,7 @@ public class ClubRegistApplyController { cUser.setUnitName(user != null ? user.getUnitname() : ""); cUser.setEmail(user != null ? user.getEmail() : ""); cUser.setPosition(user != null ? user.getPosition() : ""); + cUser.setInvite(true); clubUsers.add(cUser); //如果是管理员创建的协会，直接加角色 @@ -143,7 +144,6 @@ public class ClubRegistApplyController { cUser.setJoin_time(DateUtil.getDateTime()); cUser.setSf(2); cUser.setIsjf(true); - cUser.setStatus(6); cUser.setGiveMoney(true); cUser.setIsNormal(true); cUser.setInvite(true); @@ -151,6 +151,8 @@ public class ClubRegistApplyController { cUser.setUnitName(user != null ? user.getUnitname() : ""); cUser.setEmail(user != null ? user.getEmail() : ""); cUser.setPosition(user != null ? user.getPosition() : ""); + cUser.setInvite(item.getBoolean("invite", true)); + cUser.setStatus(item.getInt("status", 6)); clubUsers.add(cUser); } }); @@ -189,7 +191,7 @@ public class ClubRegistApplyController { @Param(value = "::clubUserList", required = false) List clubUserList) throws IOException { if(!isSave && Objects.equals(club.getState(), ClubRegistAuditState.NOT_SUBMIT) && !sysClubService.getInviteAgree(club)) { - return Result.error("邀请会员中确认人数暂未达到20人"); + return Result.error("您邀请的会员中确认人数暂未达到20人，暂不能提交，只能保存"); } //如果不是管理员，并且点的提交按钮 @@ -235,6 +237,7 @@ public class ClubRegistApplyController { cUser.setUnitName(user != null ? user.getUnitname() : ""); cUser.setEmail(user != null ? user.getEmail() : ""); cUser.setPosition(user != null ? user.getPosition() : ""); + cUser.setInvite(true); } clubUsers.add(cUser); @@ -270,6 +273,8 @@ public class ClubRegistApplyController { cUser.setUnitName(user != null ? user.getUnitname() : ""); cUser.setEmail(user != null ? user.getEmail() : ""); cUser.setPosition(user != null ? user.getPosition() : ""); + cUser.setInvite(item.getBoolean("invite", true)); + cUser.setStatus(item.getInt("status", 6)); clubUsers.add(cUser); } } diff --git a/src/main/resources/static/components/plugins/TextEditor.vue b/src/main/resources/static/components/plugins/TextEditor.vue index c640e58..b8e455e 100644 --- a/src/main/resources/static/components/plugins/TextEditor.vue +++ b/src/main/resources/static/components/plugins/TextEditor.vue @@ -89,6 +89,10 @@ module.exports = { type: Number, default: 300 }, + placeholder: { + type: String, + default: '请输入正文' + }, menus: { type: Array, default: () => { @@ -181,6 +185,7 @@ module.exports = { this.editor.config.height = this.height //菜单 this.editor.config.menus = this.menus + this.editor.config.placeholder = this.placeholder this.editor.create() }, isEmptyEditor() { diff --git a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html index 62641c4..312a111 100644 --- a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html +++ b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html @@ -117,11 +117,11 @@ layout("/layouts/platform.html"){ - + - + @@ -176,12 +176,13 @@ layout("/layouts/platform.html"){
- +