commit
This commit is contained in:
+6
@@ -16,6 +16,7 @@ import io.v.nutz.web.commons.utils.ShiroUtil;
|
|||||||
import org.apache.shiro.authz.annotation.Logical;
|
import org.apache.shiro.authz.annotation.Logical;
|
||||||
import org.apache.shiro.authz.annotation.RequiresAuthentication;
|
import org.apache.shiro.authz.annotation.RequiresAuthentication;
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
|
import org.nutz.dao.Chain;
|
||||||
import org.nutz.dao.Cnd;
|
import org.nutz.dao.Cnd;
|
||||||
import org.nutz.dao.Dao;
|
import org.nutz.dao.Dao;
|
||||||
import org.nutz.dao.Sqls;
|
import org.nutz.dao.Sqls;
|
||||||
@@ -216,6 +217,11 @@ public class ClubMyApplyController {
|
|||||||
String content = "%s老师您好,欢迎加入%s,请进入入会申请进行确认!".formatted(sysUser.getUsername(), sysClub.getName())
|
String content = "%s老师您好,欢迎加入%s,请进入入会申请进行确认!".formatted(sysUser.getUsername(), sysClub.getName())
|
||||||
+ Globals.AppDomain + "/platform/sys/club/sq/mobile";
|
+ Globals.AppDomain + "/platform/sys/club/sq/mobile";
|
||||||
msgApi.sendMsg(List.of("DingTalk"), user, 1, "协会入会邀请", content, "", "");
|
msgApi.sendMsg(List.of("DingTalk"), user, 1, "协会入会邀请", content, "", "");
|
||||||
|
|
||||||
|
dao.update(
|
||||||
|
Sys_club_user.class,
|
||||||
|
Chain.make("sendMsg", true),
|
||||||
|
Cnd.where("clubid", "=", id).and("userid", "=", sysUser.getId()));
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -221,4 +221,10 @@ public class Sys_club_user extends BaseModel {
|
|||||||
@ColDefine(type = ColType.BOOLEAN)
|
@ColDefine(type = ColType.BOOLEAN)
|
||||||
@Default("0")
|
@Default("0")
|
||||||
private Boolean invite;
|
private Boolean invite;
|
||||||
|
|
||||||
|
@Column
|
||||||
|
@Comment("是否已发送邀请")
|
||||||
|
@ColDefine(type = ColType.BOOLEAN)
|
||||||
|
@Default("0")
|
||||||
|
private Boolean sendMsg;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,6 +106,12 @@ layout("/layouts/platform.html"){
|
|||||||
<el-table-column label="所属单位" prop="unitname" show-overflow-tooltip></el-table-column>
|
<el-table-column label="所属单位" prop="unitname" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||||
<el-table-column label="联系方式" prop="mobile"></el-table-column>
|
<el-table-column label="联系方式" prop="mobile"></el-table-column>
|
||||||
|
<el-table-column label="是否已发送邀请" prop="sendMsg">
|
||||||
|
<template slot-scope="{row}">
|
||||||
|
<span class="text-success" v-if="row.sendMsg === true">是</span>
|
||||||
|
<span v-else>否</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="是否同意邀请" prop="invite">
|
<el-table-column label="是否同意邀请" prop="invite">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<span class="text-success" v-if="row.invite === true && row.status === 5">是</span>
|
<span class="text-success" v-if="row.invite === true && row.status === 5">是</span>
|
||||||
@@ -175,6 +181,7 @@ layout("/layouts/platform.html"){
|
|||||||
if(resp.code === 0) {
|
if(resp.code === 0) {
|
||||||
this.$message.success(resp.msg)
|
this.$message.success(resp.msg)
|
||||||
this.doSearch()
|
this.doSearch()
|
||||||
|
this.inviteUserDialog = false
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning(resp.msg)
|
this.$message.warning(resp.msg)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user