专题创建逻辑bug修改

src/main/java/com/zzsn/event/mapper/xml/CommonMapper.xml

@@ -72,13 +72,23 @@
             </foreach>
         </if>
         union
-        select sm.source_id,sm.subject_id from subject_info_source_map sm where type = 1
+        select sm.source_id,sm.subject_id from subject_info_source_map sm where sm.type in(1,6)
         <if test="subjectIds != null and subjectIds.size() > 0">
             and sm.subject_id in
             <foreach collection="subjectIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
+        union
+        select m.entity_code as source_id,n.subject_id from subject_info_source_map n
+        inner join clb_label_info_source_map m on n.source_id = m.label_code and n.source_item_id = m.label_item_code
+        where n.type in(12,15)
+        <if test="subjectIds != null and subjectIds.size() > 0">
+            and n.subject_id in
+            <foreach collection="subjectIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         ) x
     </select>
 
@@ -94,19 +104,28 @@
             </foreach>
         </if>
         union
-        select sm.source_id,sm.subject_id from subject_info_source_map sm where type = 3
+        select sm.source_id,sm.subject_id from subject_info_source_map sm where sm.type = 3
         <if test="subjectIds != null and subjectIds.size() > 0">
             and sm.subject_id in
             <foreach collection="subjectIds" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
+        union
+        select m.entity_code as source_id,n.subject_id from subject_info_source_map n
+        inner join clb_label_info_source_map m on n.source_id = m.label_code and n.source_item_id = m.label_item_code
+        where n.type = 14
+        <if test="subjectIds != null and subjectIds.size() > 0">
+            and n.subject_id in
+            <foreach collection="subjectIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         ) x
     </select>
 
     <select id="modelList" resultType="com.zzsn.event.vo.ModelVO">
-        select *
-        from model
+        select * from model
     </select>
 
     <select id="subjectModelBindLabels" resultType="com.zzsn.event.vo.LabelModelVo">

src/main/java/com/zzsn/event/mapper/xml/SysDictItemMapper.xml

@@ -4,6 +4,6 @@
 
     <select id="listByDictCode" resultType="com.zzsn.event.entity.SysDictItem">
         select * from sys_dict_item item inner join sys_dict dict on item.dict_id = dict.id
-        where dict.dict_code = #{dictCode}
+        where dict.dict_code = #{dictCode} and item.status = 1
     </select>
 </mapper>
\ No newline at end of file

src/main/java/com/zzsn/event/service/impl/SubjectServiceImpl.java

@@ -131,7 +131,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
     public Page<SubjectPage> researchCenterPageList(SubjectCondition subjectCondition, Integer pageNo, Integer pageSize) {
         Integer facePublic = subjectCondition.getFacePublic();
         Page<SubjectPage> page = new Page<>(pageNo, pageSize);
-        if (facePublic == 1) {
+        if (facePublic != null && facePublic == 1) {
             page = baseMapper.researchCenterFacePageList(subjectCondition, page);
         } else {
             //查询类别id的所有明细id