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

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -445,6 +445,7 @@ public class BLessonController extends PaginationController<BLesson> {
     @ApiOperation(value = "624 指派课程", notes = "根据ID指派课程")
     @PostMapping(value = "/appointLessonToPerson")
     public Result appointLessonToPerson(CurUser curUser, @Valid AppointLessonDTO appointLessonDTO, BindingResult bindingResult) {
+
         PersistModel data = bLessonService.appointLessonToPerson(appointLessonDTO);
         return Result.builder(data,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,

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

@@ -746,7 +746,7 @@ public class BLessonServiceImpl implements BLessonService {
         if (userIdList != null && userIdList.size()>0){
             userIdSet.addAll(userIdList);
         }
-        if (inDepartPerson != null && inDepartPerson.size()>0){
+        if (inDepartPerson != null && inDepartPerson.size() > 0){
             userIdSet.addAll(inDepartPerson);
         }
         //去重后放入List
@@ -874,13 +874,13 @@ public class BLessonServiceImpl implements BLessonService {
 
             bLessonPerson.setAppointId(bAppoint.getBusinessId());
             bLessonPerson.setIsAppoint("1");
-//            bLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
             bLessonPerson.setLessonId(appointLessonDTO.getLessonId());
             bLessonPerson.setPersonId(userId);
+            //            bLessonPerson.setApplyDate(new Date());//指派时间同步到lesson_person的报名时间
             bLessonPersonOthers.add(bLessonPerson);
         }
 
-        int line;
+        int line = 1;
         if (bLessonPersonOthers != null && bLessonPersonOthers.size() > 0){
             if ("1".equals(bLesson.getLessonType())){
                 //指派培训
@@ -890,10 +890,6 @@ public class BLessonServiceImpl implements BLessonService {
             }
             //指派课程
             line = bLessonPersonRepository.insertList(bLessonPersonOthers);
-//            bLessonRepository.personNumberReCount(bLesson.getBusinessId(),"0");
-        }else {
-            bLessonRepository.personNumberReCount(bLesson.getBusinessId(),bLesson.getLessonType());
-            line = 1;
         }
         bLessonRepository.personNumberReCount(bLesson.getBusinessId(),bLesson.getLessonType());
         return new PersistModel(line, MessageConstant.MESSAGE_ALERT_SUCCESS);