酷乐秀曲目来源改为内容平台

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -77,5 +77,5 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
 
     int findCount(Map<String, Object> params);
 
-    List<SubjectWrapper.Subject> findPage(@Param("params") Map<String, Object> params);
+    List<SubjectWrapper.Subject> findPage(Map<String, Object> params);
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -242,28 +242,28 @@
         LEFT JOIN instrument i on t.id_ = i.subject_id_
         <where>
             t.parent_subject_id_ != 0
-            <if test="param.delFlag != null">
-                AND t.del_flag_ = #{param.delFlag}
+            <if test="delFlag != null">
+                AND t.del_flag_ = #{delFlag}
             </if>
-            <if test="param.subjectId != null">
-                AND t.id_ = #{param.subjectId}
+            <if test="subjectId != null">
+                AND t.id_ = #{subjectId}
             </if>
-            <if test="param.subjectIds != null">
-                AND find_in_set(t.id_,#{param.subjectIds})
+            <if test="subjectIds != null">
+                AND find_in_set(t.id_,#{subjectIds})
             </if>
-            <if test="param.instrumentIds != null">
-                AND find_in_set(i.id_, #{param.instrumentIds})
+            <if test="instrumentIds != null">
+                AND find_in_set(i.id_, #{instrumentIds})
             </if>
-            <if test="param.enableFlag != null">
-                AND t.enable_flag_ = #{param.enableFlag} and i.enable_flag_ = #{param.enableFlag}
+            <if test="enableFlag != null">
+                AND t.enable_flag_ = #{enableFlag} and i.enable_flag_ = #{enableFlag}
             </if>
         </where>
         group by t.id_
-        <if test="param.hasInstrument != null">
-            <if test="param.hasInstrument == true">
+        <if test="hasInstrument != null">
+            <if test="hasInstrument == true">
                 having count(i.id_) > 0
             </if>
-            <if test="param.hasInstrument == false">
+            <if test="hasInstrument == false">
                 having count(i.id_) = 0
             </if>
         </if>) t
@@ -291,28 +291,28 @@
         LEFT JOIN instrument i on t.id_ = i.subject_id_
         <where>
             t.parent_subject_id_ != 0
-            <if test="param.delFlag != null">
-                AND t.del_flag_ = #{param.delFlag}
+            <if test="delFlag != null">
+                AND t.del_flag_ = #{delFlag}
             </if>
-            <if test="param.subjectId != null">
-                AND t.id_ = #{param.subjectId}
+            <if test="subjectId != null">
+                AND t.id_ = #{subjectId}
             </if>
-            <if test="param.subjectIds != null">
-                AND find_in_set(t.id_,#{param.subjectIds})
+            <if test="subjectIds != null">
+                AND find_in_set(t.id_,#{subjectIds})
             </if>
-            <if test="param.instrumentIds != null">
-                AND find_in_set(i.id_, #{param.instrumentIds})
+            <if test="instrumentIds != null">
+                AND find_in_set(i.id_, #{instrumentIds})
             </if>
-            <if test="param.enableFlag != null">
-                AND t.enable_flag_ = #{param.enableFlag} and i.enable_flag_ = #{param.enableFlag}
+            <if test="enableFlag != null">
+                AND t.enable_flag_ = #{enableFlag} and i.enable_flag_ = #{enableFlag}
             </if>
         </where>
         group by t.id_
-        <if test="param.hasInstrument != null">
-            <if test="param.hasInstrument == true">
+        <if test="hasInstrument != null">
+            <if test="hasInstrument == true">
                 having count(i.id_) > 0
             </if>
-            <if test="param.hasInstrument == false">
+            <if test="hasInstrument == false">
                 having count(i.id_) = 0
             </if>
         </if>