Merge branch 'dev' of http://101.37.69.204:3000/mozhe/mental-health-api into dev

# Conflicts:
#	ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScaleFactorController.java

@@ -42,10 +42,16 @@ public class SysScaleFactorController extends BaseController {
      */
     @SaCheckPermission("scale:factor:pageList")
     @GetMapping("/pageList")
-    public TableDataInfo<SysScaleFactorVo> list(SysScaleFactorBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysScaleFactorVo> pageList(SysScaleFactorBo bo, PageQuery pageQuery) {
         return sysScaleFactorService.queryPageList(bo, pageQuery);
     }
 
+    @GetMapping("/list")
+    public R<List<SysScaleFactorVo>> list(SysScaleFactorBo bo) {
+        List<SysScaleFactorVo> list = sysScaleFactorService.queryList(bo);
+        return R.ok(list);
+    }
+
     /**
      * 导出测评因子列表
      */

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysWarnRecordController.java

@@ -39,8 +39,9 @@ public class SysWarnRecordController extends BaseController {
     /**
      * 查询预警记录列表
      */
-    @SaCheckPermission("sacle:warn:pageList")
-    @GetMapping("/pageList")
+//    @GetMapping("/pageList")
+    @SaCheckPermission("scale:warn:list")
+    @GetMapping("/list")
     public TableDataInfo<SysWarnRecordVo> list(SysWarnRecordBo bo, PageQuery pageQuery) {
         return sysWarnRecordService.queryPageList(bo, pageQuery);
     }
@@ -48,7 +49,7 @@ public class SysWarnRecordController extends BaseController {
     /**
      * 导出预警记录列表
      */
-    @SaCheckPermission("sacle:warn:export")
+    @SaCheckPermission("scale:warn:export")
     @Log(title = "预警记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(SysWarnRecordBo bo, HttpServletResponse response) {
@@ -61,7 +62,7 @@ public class SysWarnRecordController extends BaseController {
      *
      * @param warnId 主键
      */
-    @SaCheckPermission("sacle:warn:query")
+    @SaCheckPermission("scale:warn:query")
     @GetMapping("/{warnId}")
     public R<SysWarnRecordVo> getInfo(@NotNull(message = "主键不能为空")
                                       @PathVariable Long warnId) {
@@ -71,7 +72,7 @@ public class SysWarnRecordController extends BaseController {
     /**
      * 修改预警记录
      */
-    @SaCheckPermission("sacle:warn:edit")
+    @SaCheckPermission("scale:warn:edit")
     @Log(title = "预警记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/web/WebController.java

@@ -3,7 +3,6 @@ package org.dromara.scale.controller.web;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
@@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser;
-
 /**
  * <p>TODO<p>
  *

ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.scale.service.impl;
 
+
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -235,6 +236,8 @@ public class WebServiceImpl implements IWebService {
 
             List<String> questionNum = questionMapByFactor.get(factorId);
             List<String> questionIds = new ArrayList<>();
+
+
             questionNum.forEach(q -> {
                 questionIds.add(q);
                 Long questionId = Long.parseLong(q);