修改编辑章节问题

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -310,7 +310,7 @@ public class BChapterServiceImpl implements BChapterService {
 
             int x = bFileRepository.updateUploadFile(bFile);
             // 判断 新文件 更新 课程学习进度（总进度 此章节进度）
-            if (!(bFileOld.getVideoUrl().equals(dto.getVideoUrl())) ) {
+            if (StringUtils.isNotEmpty(dto.getVideoUrl()) && !(bFileOld.getVideoUrl().equals(dto.getVideoUrl())) ) {
                 // 所有学习过此课程的 学生课程信息
                 List<BLessonPerson> bLessonPersonList = bLessonPersonRepository.selectByLessonId(chapterDTO.getLessonId());
                 BLesson bLesson = bLessonRepository.selectByPrimaryKey(chapterDTO.getLessonId());

src/main/java/org/rcisoft/business/bdictionary/dao/BDictionaryRepository.java

@@ -28,7 +28,7 @@ public interface BDictionaryRepository extends BaseMapper<BDictionary> {
             " <if test=\"configList != null and configList.size()>0 \">and type in " +
             " <foreach item='item' index='index' collection='configList' open='(' separator=',' close=')'> #{item} </foreach> " +
             " </if> " +
-            "  order by sort"+
+            "  order by CAST(sort AS UNSIGNED) "+
             " </script>")
     @ResultMap(value = "BaseResultMap" )
     List<BDictionary> findAllColumnConfig(@Param("curUser") CurUser curUser, @Param("configList") List<String> configList);

src/main/java/org/rcisoft/business/blesson/dao/BLessonPersonRepository.java

@@ -58,7 +58,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             " left join s_user su on blp.person_id = su.business_id " +
             " where " +
             " blp.del_flag != 1 and blp.flag = 1 " +
-            " and su.del_flag != 1 and su.flag = 1 " +
+//            " and su.del_flag != 1 and su.flag = 1 " +
             " <if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +
             " and blp.lesson_id = #{param.lessonId}) countAll, " +
 
@@ -66,7 +66,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             " left join s_user su on blp.person_id = su.business_id " +
             " where " +
             " blp.del_flag != 1 and blp.flag = 1 " +
-            " and su.del_flag != 1 and su.flag = 1 " +
+//            " and su.del_flag != 1 and su.flag = 1 " +
             " and blp.is_finish = 0 " +
             " <if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +
             " and blp.lesson_id = #{param.lessonId}) countNotStart, " +
@@ -75,7 +75,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             " left join s_user su on blp.person_id = su.business_id " +
             "  where " +
             " blp.del_flag != 1 and blp.flag = 1 " +
-            " and su.del_flag != 1 and su.flag = 1 " +
+//            " and su.del_flag != 1 and su.flag = 1 " +
             " and blp.is_finish = 1 " +
             " <if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +
             " and blp.lesson_id = #{param.lessonId}) countOngoing, " +
@@ -84,7 +84,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
             " left join s_user su on blp.person_id = su.business_id " +
             " where " +
             " blp.del_flag != 1 and blp.flag = 1 " +
-            " and su.del_flag != 1 and su.flag = 1 " +
+//            " and su.del_flag != 1 and su.flag = 1 " +
             " and blp.is_finish = 2 " +
             " <if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +
             " and blp.lesson_id = #{param.lessonId}) countFinish" +
@@ -108,11 +108,11 @@ public interface BLessonPersonRepository extends BaseMapper<BLessonPerson> {
 //            "left join b_appoint ba on ba.lesson_id = bl.business_id " +
             "where blp.del_flag != 1 and blp.flag = 1 " +
             "and bl.del_flag != 1 and bl.flag = 1 " +
-            "and su.del_flag != 1 and su.flag = 1 " +
+//            "and su.del_flag != 1 and su.flag = 1 " +
 
             "and bl.corp_id = #{param.corpId} "+
 //            "and blp.corp_id = #{param.corpId} "+
-            "and su.corp_id = #{param.corpId} "+
+//            "and su.corp_id = #{param.corpId} "+
 
             "and bl.business_id = #{param.lessonId} "+
             "<if test= \" param.isAppoint != null and param.isAppoint != ''\">and blp.is_appoint = #{param.isAppoint} </if> " +

src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java

@@ -594,7 +594,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
                     " left join s_user su on blp.person_id = su.business_id " +
                     " where blp.del_flag != 1 and blp.flag = 1 " +
                     " and bl.del_flag != 1 and bl.flag = 1 " +
-                    " and su.del_flag != 1 and su.flag = 1 " +
+//                    " and su.del_flag != 1 and su.flag = 1 " +
                     " and bl.lesson_type = 1 " +
                     " and blp.lesson_id = #{lessonId} and blp.train_is_sign is not null ) learnAllCount, " +
 
@@ -603,7 +603,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
                     " left join s_user su on blp.person_id = su.business_id " +
                     " where blp.del_flag != 1 and blp.flag = 1 " +
                     " and bl.del_flag != 1 and bl.flag = 1 " +
-                    " and su.del_flag != 1 and su.flag = 1 " +
+//                    " and su.del_flag != 1 and su.flag = 1 " +
                     " and bl.lesson_type = 1 " +
                     " and blp.lesson_id = #{lessonId}  and blp.train_is_sign = '2') finishCount, " +
 
@@ -612,7 +612,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
                     " left join s_user su on blp.person_id = su.business_id " +
                     " where blp.del_flag != 1 and blp.flag = 1 " +
                     " and bl.del_flag != 1 and bl.flag = 1 " +
-                    " and su.del_flag != 1 and su.flag = 1 " +
+//                    " and su.del_flag != 1 and su.flag = 1 " +
                     " and bl.lesson_type = 1 " +
                     " and blp.lesson_id = #{lessonId} and blp.train_is_sign = '1') notFinishCount, " +
 
@@ -621,7 +621,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
                     " left join s_user su on blp.person_id = su.business_id " +
                     " where blp.del_flag != 1 and blp.flag = 1 " +
                     " and bl.del_flag != 1 and bl.flag = 1 " +
-                    " and su.del_flag != 1 and su.flag = 1 " +
+//                    " and su.del_flag != 1 and su.flag = 1 " +
                     " and bl.lesson_type = 1 " +
                     " and blp.lesson_id = #{lessonId}  and blp.train_is_sign = '0') notStartCount " +
                     "</script>"})

src/main/java/org/rcisoft/business/blesson/dao/BRecommendRepository.java

@@ -76,7 +76,7 @@ public interface BRecommendRepository extends BaseMapper<BRecommend> {
             " <if test=\"viewParam!=null and viewParam != ''\">and su.name like CONCAT('%',#{viewParam},'%')</if>" +
             " and brs.type = '0' "+
             " and br.lesson_id = #{lessonId}" +
-            " order by brs.sort asc "+
+            " order by CAST(brs.sort AS UNSIGNED) asc "+
             "</script>")
     List<FindLessonRecommendRspDTO> queryRecommendPersonByLessonId(FindLessonRecommendDTO param);
 
@@ -96,7 +96,7 @@ public interface BRecommendRepository extends BaseMapper<BRecommend> {
             "   </if> " +
 
             " and br.lesson_id = #{lessonId}" +
-            " order by brs.sort asc "+
+            " order by CAST(brs.sort AS UNSIGNED) asc "+
             "</script>")
     List<FindLessonRecommendRspDTO> queryRecommendDepartByLessonId(FindLessonRecommendDTO param);
 }

src/main/java/org/rcisoft/business/blesson/dao/BViewrangeRepository.java

@@ -62,7 +62,7 @@ public interface BViewrangeRepository extends BaseMapper<BViewrange> {
 
             " and bv.corp_id = #{corpId} "+
 
-            " order by bvs.sort asc "+
+            " order by CAST(bvs.sort AS UNSIGNED) asc "+
              "</script>")
     List<BViewRangeSonDTO> selectDepartByLessonId(@Param("corpId") String corpId,@Param("lessonId")String lessonId);
 
@@ -81,7 +81,7 @@ public interface BViewrangeRepository extends BaseMapper<BViewrange> {
 
             " and bv.corp_id = #{corpId} "+
 
-            " order by bvs.sort asc "+
+            " order by CAST(bvs.sort AS UNSIGNED) asc "+
 
             "</script>")
     List<BViewRangeSonDTO> selectPersonByLessonId(@Param("corpId") String corpId,@Param("lessonId")String lessonId);