LicenceBackgroundServiceImpl(update)

release-service/src/main/java/com/mmc/csf/release/service/licence/impl/LicenceBackgroundServiceImpl.java

@@ -67,9 +67,9 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
                     return ResultBody.error(ResultEnum.THREE_FIELDS_CAN_BE_REPEATED);
                 }
             }
-          //  licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
+            //  licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
-        if (organizations.getTrainingProgramsVOS()==null || organizations.getTrainingProgramsVOS().size()==0){
+        if (organizations.getTrainingProgramsVOS() == null || organizations.getTrainingProgramsVOS().size() == 0) {
             licenceBackgroundDao.insertOrganizations(organizationsDO);
         }
         return ResultBody.success();
@@ -97,7 +97,7 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
                     hashMap.put(trainingProgramsVO, pro++);
                     return ResultBody.error(ResultEnum.THREE_FIELDS_CAN_BE_REPEATED);
                 }
-               // licenceBackgroundDao.removeOrganizations(organizations.getId());
+                // licenceBackgroundDao.removeOrganizations(organizations.getId());
                 programsDO = new LicenseTrainingProgramsDO(trainingProgramsVO);
                 Integer id = organizations.getId();
                 programsDO.setOrgId(id);
@@ -107,9 +107,9 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
 
             }
             licenceBackgroundDao.updateOrganizations(organizationsDO);
-           // licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
+            // licenceBackgroundDao.insertLicenseOrgTraining(organizationsDO.getOrgTrainingIds(), organizationsDO.getId());
         }
-        if (organizations.getTrainingProgramsVOS()==null || organizations.getTrainingProgramsVOS().size()==0){
+        if (organizations.getTrainingProgramsVOS() == null || organizations.getTrainingProgramsVOS().size() == 0) {
             licenceBackgroundDao.updateOrganizations(organizationsDO);
         }
         return ResultBody.success();
@@ -159,7 +159,7 @@ public class LicenceBackgroundServiceImpl implements LicenceBackgroundService {
             }
             return true;
         }).collect(Collectors.toList());*/
-
+        orgList = orgList.stream().filter(t -> t.getProgramsDOList() != null).collect(Collectors.toList());
 
         List<LicenseOrganizationsDTO> subList = orgList.stream().skip((pageNo - 1) * organizationsQO.getPageSize()).limit(organizationsQO.getPageSize()).
                 collect(Collectors.toList());