Merge remote-tracking branch 'origin/meiteng' into zql

.gitignore

 *.idea
+*.logs
 *.iml
 target/
 .settings/

pom.xml

@@ -454,14 +454,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
 
+        <!--        Apache Tika实现内容分析-->
+        <dependency>
             <groupId>org.apache.tika</groupId>
-
             <artifactId>tika-parsers</artifactId>
-
             <version>1.17</version>
-
         </dependency>
 
     </dependencies>

sql/edu_modify_lesson_value.sql

@@ -12,3 +12,6 @@ alter table b_person_value add lesson_id varchar(64) COMMENT '课程或培训id'
 
 
 # -------------测试环境已更新--------------
+
+-- 修改个人积分表中 备注字段类型  19-12-17 11:04
+alter table b_person_value modify column remarks text;
\ No newline at end of file

src/main/java/org/rcisoft/business/breleasevalue/dao/BReleaseValueRepository.java

@@ -40,6 +40,7 @@ public interface BReleaseValueRepository extends BaseMapper<BReleaseValue> {
             "<if test=\"trainSort!=null and trainSort != '' and trainSort == '0'.toString()\"> ,train_value desc </if> " +
             "<if test=\"timeSort!=null and timeSort != '' and timeSort == '1'.toString()\"> ,update_date asc </if> " +
             "<if test=\"timeSort!=null and timeSort != '' and timeSort == '0'.toString()\"> ,update_date desc </if> " +
+            "<if test=\"(lessonSort==null or lessonSort=='') and (trainSort==null or trainSort=='') and (timeSort==null or trainSort=='') \"> ,create_date asc </if> " +
             "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BReleaseValue> queryBReleaseValues(ReleaseValueResDto dto);