Merge remote-tracking branch 'origin/main'

src/main/java/com/cmeeting/aspect/OperLogAspect.java

@@ -27,10 +27,10 @@ public class OperLogAspect {
     @After(value = "@annotation(operLog)")
     public void after(JoinPoint point, OperLog operLog) {
 
-        new Thread(() -> {
-            Date now = new Date();
-            RobotSecurityUser user = SecurityUtil.getUser();
+        Date now = new Date();
+        RobotSecurityUser user = SecurityUtil.getUser();
 
+        new Thread(() -> {
             String location = operLog.location();
             String operation = operLog.operation();
 
@@ -43,5 +43,6 @@ public class OperLogAspect {
 
             operationLogService.save(operationLog);
         }).start();
+
     }
 }

src/main/java/com/cmeeting/controller/RecordTemplateController.java

@@ -48,8 +48,8 @@ public class RecordTemplateController {
     @PostMapping("/create")
     public R create(@RequestBody @Validated(EditRecordTemplateVo.AddGroup.class) EditRecordTemplateVo recordTemplate) {
 
-        recordTemplateService.save(recordTemplate);
-        return R.ok();
+        Long id = recordTemplateService.save(recordTemplate);
+        return R.ok(id);
     }
 
     /**

src/main/java/com/cmeeting/mapper/primary/MeetingRecordTemplateMapper.java

@@ -35,7 +35,7 @@ public interface MeetingRecordTemplateMapper extends BaseMapper<MeetingRecordTem
      * @param userId
      * @return
      */
-    List<MeetTypeDto> selectAllTmplWithoutPermission(String userId);
+    List<MeetTypeDto> selectAllTmplWithoutPermission(@Param("userId") String userId);
 
     /**
      * 获取模板

src/main/java/com/cmeeting/service/MeetingRecordTemplateService.java

@@ -52,7 +52,7 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp
      * 保存模板
      * @param recordTemplateVo 请求参数
      */
-    void save(EditRecordTemplateVo recordTemplateVo);
+    Long save(EditRecordTemplateVo recordTemplateVo);
 
     /**
      * 更新模板
@@ -88,9 +88,11 @@ public interface MeetingRecordTemplateService extends IService<MeetingRecordTemp
 
     /**
      * 获取模板列表
-     * @param userId 用户id
+     *
+     * @param userId           用户id
      * @param parentDeptIdList 部门id列表
+     * @param role
      * @return
      */
-    List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList);
+    List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList, String role);
 }

src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
-import com.cmeeting.constant.MeetingTypeConstant;
 import com.cmeeting.constant.PermissionPruposeType;
 import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.dto.MeetTypeDto;
@@ -22,14 +21,11 @@ import com.cmeeting.service.SysUserSyncService;
 import com.cmeeting.vo.AuthVO;
 import com.cmeeting.vo.MeetingTypeVo;
 import lombok.extern.slf4j.Slf4j;
-import org.spongycastle.math.raw.Mod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -165,7 +161,8 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         List<SysUserSyncCategory> categoryList = sysUserSyncService.getCategoryListByUserId(String.format("%08d", loginUser.getUserId()));
         List<String> parentDeptIdList = categoryList.stream().map(SysUserSyncCategory::getDeptId).collect(Collectors.toList());
 
-        return meetingRecordTemplateService.getMeetTypeList(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
+        String role = loginUser.getRole();
+        return meetingRecordTemplateService.getMeetTypeList(String.format("%08d", loginUser.getUserId()), parentDeptIdList, loginUser.getRole());
     }
 
 

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -248,14 +248,14 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
      * @param recordTemplateVo 请求参数
      */
     @Override
-    public void save(EditRecordTemplateVo recordTemplateVo) {
+    public Long save(EditRecordTemplateVo recordTemplateVo) {
+        RobotSecurityUser loginUser = SecurityUtil.getUser();
         MeetType meetType = meetTypeMapper.selectById(recordTemplateVo.getMeetingTypeId());
-        if (MeetingTypeConstant.PERSONAL_PERMISSION_NO == meetType.getPersonalPermission()) {
+        if (MeetingTypeConstant.PERSONAL_PERMISSION_NO == meetType.getPersonalPermission() && !MeetingTypeConstant.TYPE_SYSTEM.equals(loginUser.getRole())) {
             throw new RobotBaseException("当前会议类型下不允许新建纪要模板");
         }
 
         Date now = new Date();
-        RobotSecurityUser loginUser = SecurityUtil.getUser();
 
         MeetingRecordTemplate recordTemplate = new MeetingRecordTemplate();
         recordTemplate.setName(recordTemplateVo.getName());
@@ -272,7 +272,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         recordTemplate.setCreateUserName(loginUser.getUsername());
         recordTemplate.setUpdateUserName(loginUser.getUsername());
         baseMapper.insert(recordTemplate);
-
+        return recordTemplate.getId();
         // 没有保存到启用表中，默认是不启用的。
     }
 
@@ -353,7 +353,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         List<SysUserSyncCategory> categoryList = sysUserSyncService.getCategoryListByUserId(String.format("%08d", loginUser.getUserId()));
         List<String> parentDeptIdList = categoryList.stream().map(SysUserSyncCategory::getDeptId).collect(Collectors.toList());
 
-        List<MeetTypeDto> meetTypeList = getMeetTypeList(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
+        List<MeetTypeDto> meetTypeList = getMeetTypeList(String.format("%08d", loginUser.getUserId()), parentDeptIdList, loginUser.getRole());
         List<RecordTemplateDto> allRecordTemplates = meetTypeList.stream()
                                                     .map(MeetTypeDto::getRecordTemplateDTOList)
                                                     .filter(Objects::nonNull)
@@ -381,12 +381,14 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
 
     /**
      * 获取模板列表
-     * @param userId 用户id
+     *
+     * @param userId           用户id
      * @param parentDeptIdList 部门id列表
+     * @param role
      * @return
      */
     @Override
-    public List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList) {
+    public List<MeetTypeDto> getMeetTypeList(String userId, List<String> parentDeptIdList, String role) {
 
         // 查询指定授权的模板 - 从会议类型维度查询
         List<MeetTypeDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(userId, parentDeptIdList);
@@ -471,6 +473,12 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         for (MeetTypeDto meetTypeDto : permissionTmplInMeetTypeDtoList) {
             meetTypeDto.getRecordTemplateDTOList().sort(Comparator.comparing(RecordTemplateDto::getCreateTime));
         }
+
+        boolean isAdmin = RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM.equals(role);
+        if (!isAdmin) {
+            MeetTypeDto dto1 = permissionTmplInMeetTypeDtoList.stream().filter(dto -> dto.getType().equals(MeetingTypeConstant.TYPE_SYSTEM)).findFirst().get();
+            dto1.getRecordTemplateDTOList().removeIf(template -> !template.getEnable());
+        }
         return permissionTmplInMeetTypeDtoList;
     }
 

src/main/resources/mapper/primary/MeetingRecordTemplateMapper.xml

@@ -104,7 +104,7 @@
         from
             meet_type
                 left join cmt_meeting_record_template on meet_type.id = cmt_meeting_record_template.meeting_type and cmt_meeting_record_template.is_del = 0
-                    and cmt_meeting_record_template.type = 'custom'
+                    and cmt_meeting_record_template.type = 'custom' and cmt_meeting_record_template.create_user = #{userId}
                 LEFT JOIN meet_template_enable ON cmt_meeting_record_template.id = meet_template_enable.rel_id
                     AND meet_template_enable.user_id = #{userId}
         where
@@ -177,7 +177,7 @@
                     AND meet_template_enable.user_id = #{userId}
         where
             meet_type.is_del = 0
-            and (cmt_meeting_record_template.type = 'system' or cmt_meeting_record_template.create_user = #{userId})
+            and (cmt_meeting_record_template.type = 'system' or meet_type.create_user = #{userId} or cmt_meeting_record_template.create_user = #{userId})
     </select>