From 0f0c9f79a3f2dbcba48f64c93be2b46cd9552961 Mon Sep 17 00:00:00 2001
From: xfc <908466708@qq.com>
Date: Mon, 31 Mar 2025 11:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xzs/src/main/java/com/mindskip/xzs/domain/Dept.java | 9 +++++++++
 xzs/src/main/resources/mapper/ExamPaperMapper.xml   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/xzs/src/main/java/com/mindskip/xzs/domain/Dept.java b/xzs/src/main/java/com/mindskip/xzs/domain/Dept.java
index a519552..71b375c 100644
--- a/xzs/src/main/java/com/mindskip/xzs/domain/Dept.java
+++ b/xzs/src/main/java/com/mindskip/xzs/domain/Dept.java
@@ -16,6 +16,8 @@ public class Dept extends BaseVM implements Serializable {
 
     private String nodeType;
 
+    private String orgtypecode;
+
     private boolean leaf;
 
     public Integer getId() {
@@ -50,6 +52,13 @@ public class Dept extends BaseVM implements Serializable {
         this.nodeType = nodeType;
     }
 
+    public String getOrgtypecode() {
+        return orgtypecode;
+    }
+    public void setOrgtypecode(String orgtypecode) {
+        this.orgtypecode = orgtypecode;
+    }
+
     public boolean isLeaf() {
         return leaf;
     }
diff --git a/xzs/src/main/resources/mapper/ExamPaperMapper.xml b/xzs/src/main/resources/mapper/ExamPaperMapper.xml
index 98dac6f..34591b8 100644
--- a/xzs/src/main/resources/mapper/ExamPaperMapper.xml
+++ b/xzs/src/main/resources/mapper/ExamPaperMapper.xml
@@ -310,6 +310,7 @@
                 OR
                 (dl.dept_id IS NULL AND #{dateTime} BETWEEN p.limit_start_time AND p.limit_end_time)
                 )
+                AND p.subject_id = (SELECT (case orgtypecode when '0311' then 3 else 2 end) FROM `t_dept` where id =#{deptId} )
                 ORDER BY CRC32(CONCAT(#{userId}, #{deptId}, p.id))
                 LIMIT 1
             </if>