From 771239b6da2e64103b738b13e5b9306ec017a02f Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Mon, 22 Apr 2024 15:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E9=9D=9E=20web=20?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=20HttpServletRequest=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/service/impl/SysEvaluationRecordServiceImpl.java    | 4 ++--
 .../java/org/dromara/scale/service/impl/WebServiceImpl.java   | 1 -
 .../main/java/org/dromara/system/mapper/SysDeptMapper.java    | 2 ++
 .../org/dromara/system/service/impl/SysDeptServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/system/SysDeptMapper.xml        | 3 +++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
index 9837944..30671ff 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationRecordServiceImpl.java
@@ -81,8 +81,8 @@ public class SysEvaluationRecordServiceImpl implements ISysEvaluationRecordServi
         Long batchNo = bo.getBatchNo();
         List<String> scaleIds = bo.getScaleIds();
         //判断人数
-        boolean flag = deptService.isParent(deptId);
-        List<SysUser> sysUsers = userMapper.selectStudentListByDeptId(deptId, flag);
+        boolean parent = deptService.isParent(deptId);
+        List<SysUser> sysUsers = userMapper.selectStudentListByDeptId(deptId, parent);
         List<SysEvaluationRecord> recordList = new ArrayList<>();
         for (String scaleId : scaleIds) {
             for (SysUser user : sysUsers) {
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
index 51056f3..1d3197d 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/WebServiceImpl.java
@@ -237,7 +237,6 @@ public class WebServiceImpl implements IWebService {
             List<String> questionNum = questionMapByFactor.get(factorId.toString());
             List<String> questionIds = new ArrayList<>();
 
-
             questionNum.forEach(q -> {
                 questionIds.add(q);
                 Long questionId = Long.parseLong(q);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
index 3e52db6..e18fe04 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
@@ -45,4 +45,6 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
+    String selectAncestorsById(Long deptId);
+
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
index 01f854b..975b166 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -328,8 +328,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
 
     @Override
     public boolean isParent(Long deptId) {
-        SysDeptVo dept = baseMapper.selectDeptById(deptId);
-        List<String> split = StrUtil.split(dept.getAncestors(), StringUtils.SEPARATOR);
+        String ancestors = baseMapper.selectAncestorsById(deptId);
+        List<String> split = StrUtil.split(ancestors, StringUtils.SEPARATOR);
         if (split.size() <= 2) {
             return true;
         } else {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index bba949d..0896cae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -26,4 +26,7 @@
         order by d.parent_id, d.order_num
     </select>
 
+    <select id="selectAncestorsById" resultType="java.lang.String">
+        select ancestors from sys_dept where dept_id = #{deptId}
+    </select>
 </mapper>