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