修改角色模板选择器

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/notifyconfig/NotifyConfigController.java

@@ -59,7 +59,7 @@ public class NotifyConfigController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('iscs:notify-config:query')")
     public CommonResult<NotifyConfigRespVO> selectNotifyConfigById(@RequestParam("id") Long id) {
-        NotifyConfigDO notifyConfig = notifyConfigService.getNotifyConfig(id);
+        NotifyConfigRespVO notifyConfig = notifyConfigService.getNotifyConfig(id);
         return success(BeanUtils.toBean(notifyConfig, NotifyConfigRespVO.class));
     }
 

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/notifyconfig/vo/NotifyConfigSaveReqVO.java

@@ -5,6 +5,8 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 通知规则新增/修改 Request VO")
 @Data
 public class NotifyConfigSaveReqVO {
@@ -40,4 +42,9 @@ public class NotifyConfigSaveReqVO {
     @NotNull(message = "状态(0-不启用 1-启用)不能为空")
     private Integer status;
 
+    @Schema(description = "角色与模板数据")
+    private List<NotifyConfigDetailSaveReqVO> notifyConfigDetailSaveReqVOS;
+
+
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/notifyconfig/NotifyConfigService.java

@@ -45,7 +45,7 @@ public interface NotifyConfigService extends IService<NotifyConfigDO> {
      * @param id 编号
      * @return 通知规则
      */
-    NotifyConfigDO getNotifyConfig(Long id);
+    NotifyConfigRespVO getNotifyConfig(Long id);
 
     /**
      * 获得通知规则分页

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/notifyconfig/NotifyConfigServiceImpl.java

@@ -37,6 +37,10 @@ public class NotifyConfigServiceImpl extends ServiceImpl<NotifyConfigMapper, Not
         // 插入
         NotifyConfigDO notifyConfig = BeanUtils.toBean(createReqVO, NotifyConfigDO.class);
         notifyConfigMapper.insert(notifyConfig);
+        // 开始新增detail
+        if (!createReqVO.getNotifyConfigDetailSaveReqVOS().isEmpty()) {
+            notifyConfigDetailService.insertOrUpdateList(BeanUtils.toBean(createReqVO.getNotifyConfigDetailSaveReqVOS(), NotifyConfigDetailDO.class));
+        }
 
         // 返回
         return notifyConfig.getId();
@@ -47,6 +51,10 @@ public class NotifyConfigServiceImpl extends ServiceImpl<NotifyConfigMapper, Not
         // 更新
         NotifyConfigDO updateObj = BeanUtils.toBean(updateReqVO, NotifyConfigDO.class);
         notifyConfigMapper.updateById(updateObj);
+        // 开始新增detail
+        if (!updateReqVO.getNotifyConfigDetailSaveReqVOS().isEmpty()) {
+            notifyConfigDetailService.insertOrUpdateList(BeanUtils.toBean(updateReqVO.getNotifyConfigDetailSaveReqVOS(), NotifyConfigDetailDO.class));
+        }
     }
 
     @Override
@@ -64,8 +72,14 @@ public class NotifyConfigServiceImpl extends ServiceImpl<NotifyConfigMapper, Not
 
 
     @Override
-    public NotifyConfigDO getNotifyConfig(Long id) {
-        return notifyConfigMapper.selectById(id);
+    public NotifyConfigRespVO getNotifyConfig(Long id) {
+        NotifyConfigDO notifyConfigDO = notifyConfigMapper.selectById(id);
+        NotifyConfigRespVO bean = BeanUtils.toBean(notifyConfigDO, NotifyConfigRespVO.class);
+        // 查询detail
+        List<NotifyConfigDetailDO> list = notifyConfigDetailService.list(Wrappers.<NotifyConfigDetailDO>lambdaQuery()
+                .eq(NotifyConfigDetailDO::getConfigId, id));
+        bean.setNotifyConfigDetailRespVOList(BeanUtils.toBean(list, NotifyConfigDetailRespVO.class));
+        return bean;
     }
 
     @Override