diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java index b385db5..5b4f0d9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java @@ -40,6 +40,7 @@ import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; import com.starry.common.utils.VerificationCodeUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -191,6 +192,7 @@ public class WxClerkController { @ClerkUserLogin @PostMapping("/user/add") + @Transactional(rollbackFor = Exception.class) public R userAdd(@Validated @RequestBody PlayClerkUserByWxAddVo vo) { String clerkId = ThreadLocalRequestDetail.getClerkUserInfo().getId(); PlayClerkUserInfoEntity userInfo = playClerkUserInfoService.selectById(clerkId); @@ -211,7 +213,7 @@ public class WxClerkController { entity.setClerkId(clerkId); entity.setAddTime(LocalDateTime.now()); playClerkUserReviewInfoService.create(entity); - wxCustomMpService.sendClerkApplyNoticeForAdmin(entity); + wxCustomMpService.sendClerkApplyNoticeForAdmin(entity, userInfo.getTenantId()); return R.ok("申请成功"); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java index 1cb4ead..becd917 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java @@ -227,8 +227,8 @@ public class WxCustomMpService { } - public void sendClerkApplyNoticeForAdmin(PlayClerkUserReviewInfoEntity entity) { - SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(entity.getTenantId()); + public void sendClerkApplyNoticeForAdmin(PlayClerkUserReviewInfoEntity entity, String tenantId) { + SysTenantEntity tenant = tenantService.selectSysTenantByTenantId(tenantId); String template_id = tenant.getRzsqAdminTemplateId(); String tenantKey = tenant.getTenantKey(); String url = "http://" + tenantKey + ".july.hucs.top/clerk/#/admin/clerk-apply-list";