Merge branch 'zyj-fixbug1023265' into 'master'

fixbug1023265

See merge request rays/pcloud-book!723

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

@@ -1161,8 +1161,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         Long firstClassify = rightsSetting.getFirstClassify();
         Long secondClassify = rightsSetting.getSecondClassify();
-        Long gradeLabelId = null;
-        Long subjectLabelId = null;
+        Long gradeLabelId = rightsSetting.getGradeLabelId();
+        Long subjectLabelId = rightsSetting.getSubjectLabelId();
         if (rightsSetting.getRightsSettingType() == 2) {//书刊权益，分类标签从编辑书刊取
             BookAdviserDto adviserDto = bookAdviserBiz.getOneMainBook(rightsSetting.getBookId());
             firstClassify = adviserDto.getTempletId();