Merge branch 'fixbug/fixtemplet' into 'master'

bug: [none] fixtemplet

See merge request rays/pcloud-book!1148

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

@@ -2300,13 +2300,23 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         baseTempletClassify.setVolLabelId(volLabelId);
         baseTempletClassify.setVerLabelId(verLabelId);
         setClassifyAndLabel(baseTempletClassify);
-        RightsSettingDto dto = rightsSettingDAO.getByLabel(baseTempletClassify.getFirstClassify(), baseTempletClassify.getSecondClassify()
-                , baseTempletClassify.getGradeLabelId(), baseTempletClassify.getSubjectLabelId(), baseTempletClassify.getVolLabelId()
-                , baseTempletClassify.getVerLabelId(), baseTempletClassify.getThirdClassify());
+        RightsSettingDto dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, verLabelId, thirdTempletId);
+        if (null == dto) {
+            dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, verLabelId, null);
+            if (null == dto) {
+                dto = rightsSettingDAO.getByLabel(firstClassify, null, gradeLabelId, subjectLabelId, volLabelId, verLabelId, null);
+            }
+        }
         //有版本筛选但权益未配置
         if (null == dto && null != verLabelId && verLabelId > 0) {
-            Long commonLabelId = bookLabelDao.getByNameType("通用版",3);
+            Long commonLabelId = bookLabelDao.getByNameType("通用版", 3);
             dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, commonLabelId, thirdTempletId);
+            if (null == dto) {
+                dto = rightsSettingDAO.getByLabel(firstClassify, secondClassify, gradeLabelId, subjectLabelId, volLabelId, commonLabelId, null);
+                if (null == dto) {
+                    dto = rightsSettingDAO.getByLabel(firstClassify, null, gradeLabelId, subjectLabelId, volLabelId, commonLabelId, null);
+                }
+            }
         }
         return dto;
     }