Merge branch 'fixbug/fixdefaultrights' into 'master'

bug: [none] fixdefaultrights

See merge request rays/pcloud-book!1152

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -2319,6 +2319,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 }
             }
         }
+        if (null == dto) {
+            Long defaultRightsSettingId = bookBiz.getDefaultRightsSettingId();
+            dto = rightsSettingDAO.getDTOById(defaultRightsSettingId);
+        }
         return dto;
     }
 
@@ -3344,7 +3348,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             rightsSettingDto = getByLabel(adviserDto.getTempletId(), adviserDto.getSecondTempletId(), adviserDto.getGraLabelId(),
                     adviserDto.getSubLabelId(), adviserDto.getVolLabelId(), adviserDto.getVerLabelId(), adviserDto.getThirdTempletId());
             if (null == rightsSettingDto) {
-                RightsSettingDto rightsSettingDto4New = rightsSettingDAO.getDTOById(2267L);
+                RightsSettingDto rightsSettingDto4New = rightsSettingDAO.getDTOById(bookBiz.getDefaultRightsSettingId());
                 return rightsSettingDto4New;
             }
             Long rightsSettingId = rightsSettingDto.getId();