Merge branch 'online' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/EntitlementsImportAnalysis.java

@@ -145,6 +145,7 @@ public class EntitlementsImportAnalysis extends DataAnalysis<EntitlementsImportA
                                 ret += "机构专辑名称重复；";
                             } else {
                                 item.setTenantAlbumId(collect.get(0).getId());
+                                item.setTenantId(smallStudent.getTenantId());
                             }
                         }
                     }

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

@@ -50,6 +50,7 @@
             </if>
         </if>
         <where>
+            su.del_flag_ = 0
             <if test="param.keyword != null and param.keyword.trim() != ''">
                 AND (t.user_id_ like concat('%',#{param.keyword},'%')
                 or su.username_ like concat('%',#{param.keyword},'%')
@@ -77,7 +78,12 @@
                 AND t.bind_status_ = #{param.bindStatus}
             </if>
             <if test="param.lockFlag != null">
-                AND su.lock_flag_ = #{param.lockFlag}
+                <if test="param.userType == 'TEACHER'">
+                    AND tc.lock_flag_ =#{param.lockFlag}
+                </if>
+                <if test="param.userType == 'STUDENT'">
+                    AND st.lock_flag_ =#{param.lockFlag}
+                </if>
             </if>
             <if test="param.bindStartTime != null">
                 AND t.bind_time_ >= #{param.bindStartTime}