Forráskód Böngészése

1、用户端查询的角色权限、路由路径字典数据都只保留开启的
2、推送邀请码短信模版改为腾讯云

liyanbo 1 hónapja
szülő
commit
194f746792

+ 2 - 3
byzs-module-system/src/main/java/cn/iocoder/byzs/module/system/service/invitecode/InviteCodeServiceImpl.java

@@ -33,8 +33,7 @@ import java.util.stream.Collectors;
 import static cn.iocoder.byzs.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.byzs.module.system.enums.ErrorCodeConstants.INVITE_CODE_DUPLICATE;
 import static cn.iocoder.byzs.module.system.enums.ErrorCodeConstants.INVITE_CODE_NOT_EXISTS;
-import static cn.iocoder.byzs.module.system.enums.sms.SmsSceneEnum.ALY_MEMBER_PUSH_INVITATION_CODE;
-import static cn.iocoder.byzs.module.system.enums.sms.SmsSceneEnum.SYY_MEMBER_PUSH_INVITATION_CODE;
+import static cn.iocoder.byzs.module.system.enums.sms.SmsSceneEnum.*;
 
 /**
  * 邀请码 Service 实现类
@@ -423,7 +422,7 @@ public class InviteCodeServiceImpl implements InviteCodeService {
             
             // 发送短信(使用短信模板编码,需要根据实际情况配置)
             // 这里假设模板编码为 "invite_code_notify"
-            Long smsLogId = smsSendService.sendSingleSmsToAdmin(inviteCode.getOnlyPhone(), null, SYY_MEMBER_PUSH_INVITATION_CODE.getTemplateCode(), templateParams);
+            Long smsLogId = smsSendService.sendSingleSmsToAdmin(inviteCode.getOnlyPhone(), null, TXY_MEMBER_PUSH_INVITATION_CODE.getTemplateCode(), templateParams);
             if (smsLogId == null) {
                 // 更新通知状态为失败
                 inviteCode.setNotifyStatus("20");

+ 8 - 2
byzs-web/src/main/java/cn/iocoder/byzs/module/web/service/login/WebLoginServiceImpl.java

@@ -159,7 +159,10 @@ public class WebLoginServiceImpl {
         // 如果roleRoutes为空,则从字典中获取默认路由
         if (roleRouteSet.isEmpty()) {
             List<DictDataDO> webRoleRoute = dictDataService.getDictDataListByDictType("web_role_route");
-            Set<String> roleRoute = webRoleRoute.stream().map(DictDataDO::getValue).collect(Collectors.toSet());
+            Set<String> roleRoute = webRoleRoute.stream()
+                    .filter(dictData -> CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus()))
+                    .map(DictDataDO::getValue)
+                    .collect(Collectors.toSet());
             roleRouteSet.addAll(roleRoute);
         }
 
@@ -190,7 +193,10 @@ public class WebLoginServiceImpl {
                 webRoleRouteVO.setCourseRouteMenuList(roleRouteMenuSet);
             }else{
                 List<DictDataDO> webRoleRoute = dictDataService.getDictDataListByDictType("web_course_menu_route");
-                Set<String> roleRoute = webRoleRoute.stream().map(DictDataDO::getValue).collect(Collectors.toSet());
+                Set<String> roleRoute = webRoleRoute.stream()
+                        .filter(dictData -> CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus()))
+                        .map(DictDataDO::getValue)
+                        .collect(Collectors.toSet());
                 webRoleRouteVO.setCourseRouteMenuList(roleRoute);
             }
         }