|
@@ -28,6 +28,7 @@
|
|
|
<result column="attribute1_" property="attribute1" />
|
|
|
<result column="attribute2_" property="attribute2" />
|
|
|
<result column="subject_id_list_" property="subjectIdList" />
|
|
|
+ <result column="organ_id_list_" property="organIdList" />
|
|
|
<result column="subject_name_" property="subjectName" />
|
|
|
</resultMap>
|
|
|
|
|
@@ -214,6 +215,9 @@
|
|
|
<if test="subjectId != null">
|
|
|
and find_in_set(#{subjectId},sni.subject_id_list_)
|
|
|
</if>
|
|
|
+ <if test="organId != null">
|
|
|
+ and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null)
|
|
|
+ </if>
|
|
|
<if test="clientName != 'manage'">
|
|
|
<choose>
|
|
|
<when test="memo != null and memo != ''">
|
|
@@ -254,6 +258,9 @@
|
|
|
<if test="subjectId != null">
|
|
|
and find_in_set(#{subjectId},sni.subject_id_list_)
|
|
|
</if>
|
|
|
+ <if test="organId != null">
|
|
|
+ and (find_in_set(#{organId},sni.organ_id_list_) or sni.organ_id_list_ is null)
|
|
|
+ </if>
|
|
|
<if test="clientName != 'manage'">
|
|
|
<choose>
|
|
|
<when test="memo != null and memo != ''">
|