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

src/main/java/org/rcisoft/business/bbanner/service/impl/BBannerServiceImpl.java

@@ -55,7 +55,7 @@ public class BBannerServiceImpl implements BBannerService {
             Pattern pattern = Pattern.compile(regex);
 
             if (!pattern.matcher(model.getExternalUrl()).matches()) {
-                throw new ServiceException("网址不合法(http(s)://xxxx.xx)");
+                throw new ServiceException(ResultServiceEnums.ILLEGAL_URL);
             }
         }
         //内部链接但类型或课程ID为空或长度为0 抛异常

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

@@ -179,6 +179,11 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         //没有指派人员 删除指派表
         if (StringUtils.isEmpty(designatedIdRes)){
             bAppointRepository.deleteByPrimaryKey(bAppoint);
+        }else {
+            //更新b_appoint表
+            UserUtil.setCurrentMergeOperation(bAppoint);
+            bAppoint.setDesignatedId(designatedIdRes);
+            bAppointRepository.updateByPrimaryKeySelective(bAppoint);
         }
 
         return new PersistModel(1,result);

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -235,6 +235,7 @@ public enum ResultServiceEnums {
     CHAPTER_ONLY_ONE(135,"当前课程仅有一节，不能被删除"),
     LESSON_NO_CHAPTER(136,"当前课程暂无章节，不能被发布"),
     ROLE_IS_NULL(137,"当前未勾选角色，请勾选角色"),
+    ILLEGAL_URL(138,"网址不合法(http(s)://xxxx.xx)"),
     ;
 
     private Integer code;