新增总成绩字段，以及部分接口

ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysGradeWeight;
 import com.ruoyi.system.domain.SysTrainingScore;
 import com.ruoyi.system.domain.SysTrainingScoreExample;
+import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
 import com.ruoyi.system.domain.vo.ReportDto;
 import com.ruoyi.system.domain.vo.TrainingScoreVo;
 import com.ruoyi.system.domain.vo.TrainingTotalScoreVo;
@@ -43,7 +44,7 @@ public class TrainingScoreController {
         String controlsName = jsonObject.getString("controlsName");
         Long userId = jsonObject.getLong("userId");
         //检查状态是否提交且变更的值是否有数据 如果返回值为false 则执行更新操作
-        SysTrainingScore sysTrainingScore = trainingScoreService.checkStatusAndControlsName(userId, controlsName);
+        SysTrainingScoreWithBLOBs sysTrainingScore = trainingScoreService.checkStatusAndControlsName(userId, controlsName);
         if (sysTrainingScore != null) {
             //更新userid的进度和分数
             sysTrainingScore.calculateDataScore();
@@ -85,12 +86,12 @@ public class TrainingScoreController {
     //一键审批
     @PostMapping("/approvalAll")
     private String approvalAll() {
-        List<SysTrainingScore> trainingScoreList = trainingScoreService.selectAllReportContent();
+        List<SysTrainingScoreWithBLOBs> trainingScoreList = trainingScoreService.selectAllReportContent();
         if (trainingScoreList.isEmpty()) {
             return "没有可审批的数据";
         }
         for (int i = 0; i < trainingScoreList.size(); i++) {
-            SysTrainingScore sysTrainingScore = trainingScoreList.get(i);
+            SysTrainingScoreWithBLOBs sysTrainingScore = trainingScoreList.get(i);
             if (sysTrainingScore.getReportContent() == null || "".equals(sysTrainingScore.getReportContent()) || sysTrainingScore.getTrainingReportScore() != null) {
                 continue;
             }
@@ -107,7 +108,7 @@ public class TrainingScoreController {
             } else {
                 score = 100; // 超过350字直接满分
             }
-            SysTrainingScore trainingScore = new SysTrainingScore();
+            SysTrainingScoreWithBLOBs trainingScore = new SysTrainingScoreWithBLOBs();
             trainingScore.setId(sysTrainingScore.getId());
             trainingScore.setTrainingReportScore(score);
             trainingScoreService.updateByPrimaryKeySelective(trainingScore);
@@ -137,9 +138,9 @@ public class TrainingScoreController {
     public String getSubmitAndSaveReport(@RequestParam Long userId) {
         SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
         trainingScoreExample.createCriteria().andUseridEqualTo(userId);
-        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
+        List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
         if (!sysTrainingScores.isEmpty()) {
-            SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+            SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
             return sysTrainingScore.getReportContent();
         }
         return null;

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysTrainingScoreService.java

@@ -1,29 +1,30 @@
 package com.ruoyi.system.service;
 
-import com.alibaba.fastjson2.JSONObject;
+
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.SysTrainingScore;
+import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
 import com.ruoyi.system.domain.vo.ReportDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
+
 
 public interface ISysTrainingScoreService {
 
-    SysTrainingScore checkStatusAndControlsName(Long userId, String controlsName);
+    SysTrainingScoreWithBLOBs checkStatusAndControlsName(Long userId, String controlsName);
 
     AjaxResult uploadReport(MultipartFile file, String fileName, Long id);
 
     AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit);
 
-    void updateByPrimaryKeySelective(SysTrainingScore sysTrainingScore);
+    void updateByPrimaryKeySelective(SysTrainingScoreWithBLOBs sysTrainingScore);
 
     SysTrainingScore selectByUserId(Long userId);
 
-    List<SysTrainingScore> selectAllReportContent();
+    List<SysTrainingScoreWithBLOBs> selectAllReportContent();
 
     PageInfo<ReportDto> teacherGetReport(Integer index, Integer size, Double reportWeight, Double operatorWeight, String keyWord, String stuClass);
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTrainingScoreServiceImpl.java

@@ -1,16 +1,14 @@
 package com.ruoyi.system.service.impl;
 
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.TrainingScoreConstants;
-import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysGradeWeight;
 import com.ruoyi.system.domain.SysTrainingScore;
 import com.ruoyi.system.domain.SysTrainingScoreExample;
+import com.ruoyi.system.domain.SysTrainingScoreWithBLOBs;
 import com.ruoyi.system.domain.vo.ReportDto;
 import com.ruoyi.system.mapper.SysGradeWeightMapper;
 import com.ruoyi.system.mapper.SysTrainingScoreMapper;
@@ -47,7 +45,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
 
     @Override
     public void insertByUserId(Long userId) {
-        SysTrainingScore sysTrainingScore = new SysTrainingScore();
+        SysTrainingScoreWithBLOBs sysTrainingScore = new SysTrainingScoreWithBLOBs();
         sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
         sysTrainingScore.setUserid(userId);
         sysTrainingScore.setStatus(0);
@@ -65,19 +63,19 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
 
 
     @Override
-    public SysTrainingScore checkStatusAndControlsName(Long userId, String controlsName) {
+    public SysTrainingScoreWithBLOBs checkStatusAndControlsName(Long userId, String controlsName) {
         SysTrainingScoreExample example = new SysTrainingScoreExample();
         SysTrainingScoreExample.Criteria criteria = example.createCriteria();
         criteria.andUseridEqualTo(userId);
-        List<SysTrainingScore> trainingScores = trainingScoreMapper.selectByExample(example);
+        List<SysTrainingScoreWithBLOBs> trainingScores = trainingScoreMapper.selectByExampleWithBLOBs(example);
-        SysTrainingScore sysTrainingScore = trainingScores.get(0);
+        SysTrainingScoreWithBLOBs sysTrainingScore = trainingScores.get(0);
         if (sysTrainingScore.getStatus() == 1) {
             return null;
         } else {
             if (sysTrainingScore.get(controlsName) == null || ("").equals(sysTrainingScore.get(controlsName)) || "null".equals(sysTrainingScore.get(controlsName))) {
                 Map<String, Integer> trainingScoreConstantsMap = TrainingScoreConstants.getTrainingScoreConstantsMap();
                 Integer score = trainingScoreConstantsMap.get(controlsName);
-                SysTrainingScore trainingScore = new SysTrainingScore();
+                SysTrainingScoreWithBLOBs trainingScore = new SysTrainingScoreWithBLOBs();
                 trainingScore.setId(sysTrainingScore.getId());
                 trainingScore.set(controlsName, String.valueOf(score));
                 if (controlsName.equals("dataCollectionStepDescription")) {
@@ -93,7 +91,7 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
     }
 
 
-    public void updateByPrimaryKeySelective(SysTrainingScore trainingScore) {
+    public void updateByPrimaryKeySelective(SysTrainingScoreWithBLOBs trainingScore) {
         trainingScoreMapper.updateByPrimaryKeySelective(trainingScore);
     }
 
@@ -144,9 +142,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
             for (SysUser user : users) {
                 SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
                 trainingScoreExample.createCriteria().andUseridEqualTo(user.getUserId());
-                List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample);
+                List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
                 if (!sysTrainingScores.isEmpty()) {
-                    SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+                    SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
                     // 检查是否已经存在分数
                     if (sysTrainingScore.getTotalscore() != null &&
                             sysTrainingScore.getTrainingReportScore() != null &&
@@ -183,9 +181,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
         for (SysUser sysUser : userList) {
             SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
             trainingScoreExample.createCriteria().andUseridEqualTo(sysUser.getUserId());
-            List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample);
+            List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
             if (!sysTrainingScores.isEmpty()) {
-                SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+                SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
                 if (sysTrainingScore.getTotalscore() != null &&
                         sysTrainingScore.getTrainingReportScore() != null &&
                         sysTrainingScore.getTrainingOperationScore() != null) {
@@ -220,14 +218,15 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
     }
 
     @Override
-    public List<SysTrainingScore> selectAllReportContent() {
+    public List<SysTrainingScoreWithBLOBs> selectAllReportContent() {
-        List<SysTrainingScore> trainingScores = trainingScoreMapper.selectAllReportContent();
+//        List<SysTrainingScoreWithBLOBs> trainingScores = trainingScoreMapper.selectAllReportContent();
-        return trainingScores;
+        SysTrainingScoreExample e = new SysTrainingScoreExample();
+        return trainingScoreMapper.selectByExampleWithBLOBs(e);
     }
 
 
     //    算分
-    private ReportDto createReportDto(SysTrainingScore sysTrainingScore, SysUser user, Double reportWeight, Double operatorWeight) {
+    private ReportDto createReportDto(SysTrainingScoreWithBLOBs sysTrainingScore, SysUser user, Double reportWeight, Double operatorWeight) {
         DecimalFormat df = new DecimalFormat("#.##"); // 指定保留两位小数
         ReportDto reportDto = new ReportDto();
         reportDto.setFileName(sysTrainingScore.getReportFilename());
@@ -298,24 +297,24 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
         String filePath = fileUtil.upload(file);
         SysTrainingScoreExample sysTrainingScoreExample = new SysTrainingScoreExample();
         sysTrainingScoreExample.createCriteria().andUseridEqualTo(id);
-        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(sysTrainingScoreExample);
+        List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(sysTrainingScoreExample);
         if (!sysTrainingScores.isEmpty()) {
-            SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+            SysTrainingScoreWithBLOBs sysTrainingScoreWithBLOBs = sysTrainingScores.get(0);
-            if (sysTrainingScore != null && sysTrainingScore.getReportContent() != null && !sysTrainingScore.getReportContent().isEmpty()) {
+            if (sysTrainingScoreWithBLOBs != null && "已提交".equals(sysTrainingScoreWithBLOBs.getReportstatus())) {
-                return AjaxResult.error(400,"报告已提交，不允许上传和修改");
+                return AjaxResult.error(400, "报告已提交，不允许上传和修改");
             }
-            if (sysTrainingScore != null && StringUtils.hasText(sysTrainingScore.getReportUploadPath())) {
+            if (sysTrainingScoreWithBLOBs != null && StringUtils.hasText(sysTrainingScoreWithBLOBs.getReportUploadPath())) {
-                fileUtil.remove(sysTrainingScore.getReportUploadPath());
+                fileUtil.remove(sysTrainingScoreWithBLOBs.getReportUploadPath());
-                sysTrainingScore.setReportUploadPath(filePath);
+                sysTrainingScoreWithBLOBs.setReportUploadPath(filePath);
-                sysTrainingScore.setReportFilename(fileName);
+                sysTrainingScoreWithBLOBs.setReportFilename(fileName);
-                trainingScoreMapper.updateByExample(sysTrainingScore, sysTrainingScoreExample);
+                trainingScoreMapper.updateByExample(sysTrainingScoreWithBLOBs, sysTrainingScoreExample);
                 return AjaxResult.success("上传成功");
             } else {
-                if (sysTrainingScore != null) {
+                if (sysTrainingScoreWithBLOBs != null) {
-                    sysTrainingScore.setReportUploadPath(filePath);
+                    sysTrainingScoreWithBLOBs.setReportUploadPath(filePath);
-                    sysTrainingScore.setReportFilename(fileName);
+                    sysTrainingScoreWithBLOBs.setReportFilename(fileName);
                 }
-                trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
+                trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScoreWithBLOBs);
                 return AjaxResult.success("上传成功");
             }
         }
@@ -328,28 +327,35 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
     public AjaxResult saveOrSubmitReport(String content, Long userId, boolean isSubmit) {  // isSubmit为true时提交   false保存
         SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
         trainingScoreExample.createCriteria().andUseridEqualTo(userId);
-        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample);
+        List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
         if (!sysTrainingScores.isEmpty()) {
-            SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+            SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
             if (StringUtils.isEmpty(sysTrainingScore.getReportstatus())) {
                 sysTrainingScore.setReportstatus("未提交"); // 设置默认值为"未提交"
             }
             if (sysTrainingScore.getReportstatus().equals("已提交")) { // 检查报告状态，如果已提交，则不允许再次提交
-                return AjaxResult.error(400,"报告已提交，不可重复提交，如需再次提交，请点击重新实训");
+                return AjaxResult.error(400, "报告已提交，不可重复提交，如需再次提交，请点击重新实训");
             }
             if (isSubmit) {
                 if (sysTrainingScore.getReportUploadPath() == null) {
-                    return AjaxResult.error(400,"请先上传再提交");
+                    return AjaxResult.error(400, "请先上传再提交");
+                }
+                if (sysTrainingScore.getReportSaveContent()!=null){
+                    sysTrainingScore.setReportContent(sysTrainingScore.getReportSaveContent());
+                    sysTrainingScore.setReportstatus("已提交");
+                    trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
+                    return AjaxResult.success("提交成功");
+                }else {
+                    sysTrainingScore.setReportContent(content);
+                    sysTrainingScore.setReportstatus("已提交");
+                    trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
+                    return AjaxResult.success("提交成功");
                 }
-                sysTrainingScore.setReportContent(content);
-                sysTrainingScore.setReportstatus("已提交");
-                trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
-                return AjaxResult.success("提交成功");
             } else {
                 if (sysTrainingScore.getReportstatus().equals("已提交")) {
-                    return AjaxResult.error(400,"报告已提交，无法修改");
+                    return AjaxResult.error(400, "报告已提交，无法修改");
                 }
-                sysTrainingScore.setReportContent(content);
+                sysTrainingScore.setReportSaveContent(content);
                 trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);
                 return AjaxResult.success("保存成功");
             }
@@ -408,9 +414,9 @@ public class SysTrainingScoreServiceImpl implements ISysTrainingScoreService {
     public void reportGrade(Integer reportScore, Long userId) {
         SysTrainingScoreExample trainingScoreExample = new SysTrainingScoreExample();
         trainingScoreExample.createCriteria().andUseridEqualTo(userId);
-        List<SysTrainingScore> sysTrainingScores = trainingScoreMapper.selectByExample(trainingScoreExample);
+        List<SysTrainingScoreWithBLOBs> sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample);
         if (!sysTrainingScores.isEmpty()) {
-            SysTrainingScore sysTrainingScore = sysTrainingScores.get(0);
+            SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0);
             sysTrainingScore.setTrainingReportScore(reportScore);
             sysTrainingScore.setPreTrainingReportScore(reportScore);
             trainingScoreMapper.updateByPrimaryKeySelective(sysTrainingScore);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
 import javax.validation.Validator;
 
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.system.domain.SysTrainingScore;
+import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,15 +24,12 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysUserPost;
-import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -117,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -129,7 +126,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -146,7 +143,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -163,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */
@@ -216,7 +213,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     @Override
@@ -230,7 +227,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户是否有数据权限
-     * 
+     *
      * @param userId 用户id
      */
     @Override
@@ -250,7 +247,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -267,7 +264,7 @@ public class SysUserServiceImpl implements ISysUserService
         insertUserRole(user);
         //新增实训成绩
         Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber());
-        SysTrainingScore sysTrainingScore = new SysTrainingScore();
+        SysTrainingScoreWithBLOBs sysTrainingScore = new SysTrainingScoreWithBLOBs();
         sysTrainingScore.setUserid(userId);
         sysTrainingScore.setStatus(0);
         sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
@@ -277,7 +274,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 注册用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -289,7 +286,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -311,7 +308,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 用户授权角色
-     * 
+     *
      * @param userId 用户ID
      * @param roleIds 角色组
      */
@@ -325,7 +322,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -337,7 +334,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -349,7 +346,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
      * @param avatar 头像地址
      * @return 结果
@@ -362,7 +359,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -374,7 +371,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -387,7 +384,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param user 用户对象
      */
     public void insertUserRole(SysUser user)
@@ -397,7 +394,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户岗位信息
-     * 
+     *
      * @param user 用户对象
      */
     public void insertUserPost(SysUser user)
@@ -420,7 +417,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param userId 用户ID
      * @param roleIds 角色组
      */
@@ -443,7 +440,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -461,7 +458,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -487,7 +484,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 导入用户数据
-     * 
+     *
      * @param userList 用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @param operName 操作用户