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

src/main/java/org/rcisoft/business/bcourse/dao/BCourseRepository.java

@@ -17,28 +17,28 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
 
     @Select("<script>SELECT * FROM b_course where del_flag != 1 and flag = 1 and course_level = 1 " +
 
-            "and corp_id = #{corpId}" +
+            " and corp_id = #{corpId} " +
 
             "<if test=\"cName!=null and cName != ''\"> and c_name like CONCAT('%',#{cName},'%') </if>" +
             "ORDER BY sort</script>")
     @ResultMap(value = "ChildListResultMap")
     List<QueryCourseResDTO> queryCourses(Map<String, Object> param);
 
-    @Select("select *from b_course where del_flag != 1 and pid = #{pid} ORDER BY sort")
+    @Select("select *from b_course where del_flag != 1 and pid = #{pid} ORDER BY sort ")
     @ResultMap(value = "ChildListResultMap")
     List<QueryCourseResDTO> queryCoursesByPid(String parentId);
 
-    @Select("SELECT * from b_course WHERE del_flag='0' AND flag='1'" +
+    @Select("SELECT * from b_course WHERE del_flag != 1 AND flag = 1 " +
 
-            "and corp_id = #{corpId}" +
+            " and corp_id = #{corpId} " +
 
-            "AND c_name=#{cName}")
+            " AND c_name=#{cName} ")
     List<BCourse> selectOneByName(@Param("cName") String id, @Param("corpId") String corpId);
 
 //    @Update("UPDATE b_course SET del_flag='1' WHERE business_id = #{businessId}")
     @Update("<script>" +
             "<foreach collection=\"courseIds\" item=\"item\" separator=\";\">" +
-            "UPDATE b_course SET del_flag='1' WHERE business_id = #{item}" +
+            "UPDATE b_course SET del_flag = '1' WHERE business_id = #{item}" +
             "</foreach>" +
             "</script>")
     int removeCourse(@Param("courseIds") List<String> courseIds);
@@ -48,22 +48,22 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
 
     @Select("select DISTINCT course_level from b_course where business_id = #{pid} " +
 
-            "and corp_id = #{corpId}"
+            "and corp_id = #{corpId} "
     )
     int queryParentLevel(@Param("pid") String pid, @Param("corpId") String corpId);
 
     @Select("select * from b_course where course_level = 1 and del_flag != '1' and flag ='1' " +
 
-            "and corp_id = #{corpId}" +
+            " and corp_id = #{corpId} " +
 
-            "ORDER BY sort limit #{num}")
+            " ORDER BY sort limit #{num}")
     @ResultMap(value = "BaseResultMapDTO")
     List<QueryCourseResDTO> queryFirstLevel(@Param("corpId") String corpId,@Param("num") int num);
 
     @Select("select DISTINCT IFNULL((" +
             "select max(sort) from b_course where pid = #{pid} " +
 
-            "and corp_id = #{corpId}" +
+            " and corp_id = #{corpId} " +
 
             "and  del_flag = 0 and flag = 1),0)+1 as sort")
     int getSort(@Param("pid") String pid,@Param("corpId") String corpId);
@@ -77,7 +77,7 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
 
             "and corp_id = #{corpId} " +
 
-            "and flag ='1'")
+            "and flag ='1' ")
     @ResultMap(value = "AllCourseResultMap")
     List<AllCourseDTO> findAllCourse(@Param("corpId") String corpId);
 

src/main/java/org/rcisoft/business/bcourse/service/impl/BCourseServiceImpl.java

@@ -92,7 +92,7 @@ public class BCourseServiceImpl implements BCourseService {
 
         List<AllCourseDTO> allCourse = null;
 
-        if (org.apache.commons.lang3.StringUtils.isNotEmpty(id)) {
+        if (StringUtils.isNotEmpty(id)) {
             allCourse = this.findAllCourse(corpId);
         }
         List<String> courseIds = null;
@@ -113,7 +113,7 @@ public class BCourseServiceImpl implements BCourseService {
             throw new ServiceException(ResultServiceEnums.NAME_IS_EXISTS);
         }
         UserUtil.setCurrentMergeOperation(bCourse);
-        return new PersistModel(bCourseRepository.updateByPrimaryKeySelective(bCourse), MessageConstant.MESSAGE_ALERT_SUCCESS);
+        return new PersistModel(bCourseRepository.updateCourse(bCourse), MessageConstant.MESSAGE_ALERT_SUCCESS);
     }
 
     @Override