commit

src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java

@@ -180,10 +180,10 @@ public class MemberApplyBranchUnionAuditController {
             sysUserService.deleteCacheAndUpdate(user.getId());
 
             MemberApplyToDoHandler.COMPLETE_PROCESS.exec(record, null);
-            String content = "尊敬的%s老师，您已正式成为杭医工会会员，会员关系在%s，欢迎您的加入！"
+            String content = "亲爱的%s老师：欢迎您加入杭州医学院大家庭！您的工会关系在%s，愿您在这个充满活力的集体中，感受“家”的温馨，汇聚“爱”的力量。学校工会将始终陪伴在您身边，竭诚为您服务，期待与您携手同行，共同书写属于“杭医人”的精彩！"
                     .formatted(user.getUsername(), union.getUnionname());
             System.out.println(content);
-            msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "入会结果通知", content, "", "");
+            msgApi.sendMsg(List.of("DingTalk"), record.getLoginname(), 1, "", content, "", "");
         } else {
             // 杭州医学院，分工会拒绝接收，还要去创建校工会的审核任务
             MemberApplyToDoHandler.REFUSE_UNION_TASK.exec(record, NutMap.NEW().addv("nodeName", "分工会拒绝接收"));

src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyController.java

@@ -4,6 +4,7 @@ import cn.wizzer.framework.base.Result;
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.utils.MsgApi;
 import io.v.nutz.base.utils.Roles;
+import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.sys.models.User;
 import io.v.nutz.web.commons.base.Globals;
@@ -21,6 +22,7 @@ import org.nutz.dao.Dao;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
@@ -150,7 +152,23 @@ public class MemberApplyController {
     @At
     @ViReturn
     @Aop(TransAop.READ_COMMITTED)
+    @RequiresPermissions("member.apply.submit")
     public Object validateApply(){
         return dao.count(MemberApplyRecord.class, Cnd.where("userId", "=", ShiroUtil.getUserId()).and("applyStateId", "in", List.of(10, 20, 30, 50, 60)));
     }
+
+
+    @At
+    @ViReturn
+    @RequiresPermissions("member.apply.submit")
+    public Object getSelfUserInfo(){
+        Sys_user user = (Sys_user) ShiroUtil.getPrincipal();
+        if (Lang.isNotEmpty(user)) {
+            Sys_user sourceUser = dao.fetch(Sys_user.class, ShiroUtil.getUserId());
+            user.setMember(sourceUser.getMember());
+        }
+        return user;
+    }
+
+
 }

src/main/java/io/v/nutz/zhgh/staffmanage/sourcechange/service/impl/SourceChangeManageServiceImpl.java

@@ -322,8 +322,9 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl<SourceChangeM
             List<NutMap> beforeMapList = commonService.listMap(beforeUnionAdminSql);
             if (Lang.isNotEmpty(beforeMapList)) {
                 for (NutMap map : beforeMapList) {
-                    String beforeContent = "尊敬的%s老师，根据学校最新人员信息调整，%s老师的工会关系已从您处调整至%s。特此告知，烦请知悉。祝您生活愉快！"
-                            .formatted(map.getString("username"), middleTable.getUsername(), afterUnionMap.getString("unionname"));
+                    // XX分工会，根据学校最新人员调整，XX老师的工会关系已调整至XX工会。烦请知悉。
+                    String beforeContent = "%s，根据学校最新人员调整，%s老师的工会关系已调整至%s。烦请知悉。"
+                            .formatted(beforeUnionMap.getString("unionname"), middleTable.getUsername(), afterUnionMap.getString("unionname"));
 
                     System.out.println(beforeContent);
                     msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 1, "工会关系转出通知", beforeContent, "", "");
@@ -348,8 +349,9 @@ public class SourceChangeManageServiceImpl extends BaseServiceImpl<SourceChangeM
 
             if (Lang.isNotEmpty(afterMapList)) {
                 for (NutMap map : afterMapList) {
-                    String afterContent = "尊敬的%s老师，根据学校最新人员信息调整，%s老师的工会关系已从%s调整至您处。特此告知，烦请知悉。祝您生活愉快！"
-                            .formatted(map.getString("username"), middleTable.getUsername(), beforeUnionMap.getString("unionname"));
+                    // ✘✘分工会，根据学校最新人员调整，XX老师的工会关系已从XX工会调整至您处。请予接洽。
+                    String afterContent = "%s，根据学校最新人员调整，%s老师的工会关系已从%s调整至您处。请予接洽。"
+                            .formatted(afterUnionMap.getString("unionname"), middleTable.getUsername(), beforeUnionMap.getString("unionname"));
 
                     System.out.println(afterContent);
                     msgApi.sendMsg(List.of("DingTalk"), map.getString("loginname"), 1, "工会关系转入通知", afterContent, "", "");