Merge branch 'dev-3.0.0' of portal-site-qinghai/portal-site-back into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/openGovernment/modular/ogDutyBasis/service/impl/OgDutyBasisServiceImpl.java

@@ -40,20 +40,21 @@ import java.util.List;
  * 公开内容管理-履职依据表Service接口实现类
  *
  * @author hjc
- * @date  2024/05/20 19:34
+ * @date 2024/05/20 19:34
  **/
 @Service
 public class OgDutyBasisServiceImpl extends ServiceImpl<OgDutyBasisMapper, OgDutyBasis> implements OgDutyBasisService {
 
     @Autowired
     private OgDutyBasisMapper ogDutyBasisMapper;
+
     @Override
     public Page<OgDutyBasis> page(OgDutyBasisPageParam ogDutyBasisPageParam) {
         QueryWrapper<OgDutyBasis> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(ogDutyBasisPageParam.getTitle())){
-            queryWrapper.like("title",ogDutyBasisPageParam.getTitle());
+        if (StringUtils.isNotEmpty(ogDutyBasisPageParam.getTitle())) {
+            queryWrapper.like("title", ogDutyBasisPageParam.getTitle());
         }
-        if(ObjectUtil.isAllNotEmpty(ogDutyBasisPageParam.getSortField(), ogDutyBasisPageParam.getSortOrder())) {
+        if (ObjectUtil.isAllNotEmpty(ogDutyBasisPageParam.getSortField(), ogDutyBasisPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(ogDutyBasisPageParam.getSortOrder());
             queryWrapper.orderBy(true, ogDutyBasisPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(ogDutyBasisPageParam.getSortField()));
@@ -93,7 +94,7 @@ public class OgDutyBasisServiceImpl extends ServiceImpl<OgDutyBasisMapper, OgDut
     @Override
     public OgDutyBasis queryEntity(String id) {
         OgDutyBasis ogDutyBasis = this.getById(id);
-        if(ObjectUtil.isEmpty(ogDutyBasis)) {
+        if (ObjectUtil.isEmpty(ogDutyBasis)) {
             throw new CommonException("公开内容管理-履职依据表不存在，id值为：{}", id);
         }
         return ogDutyBasis;
@@ -103,7 +104,7 @@ public class OgDutyBasisServiceImpl extends ServiceImpl<OgDutyBasisMapper, OgDut
      * 启用，禁用
      *
      * @author hjc
-     * @date  2024/05/20 16:18
+     * @date 2024/05/20 16:18
      */
     @Override
     public void enableAndDisable(CommonValidList<OgDutyBasisAndStatusParam> paramCommonValidList) {
@@ -122,15 +123,15 @@ public class OgDutyBasisServiceImpl extends ServiceImpl<OgDutyBasisMapper, OgDut
      * 网站-履职依据表详情
      *
      * @author hjc
-     * @date  2024/05/20 19:34
+     * @date 2024/05/20 19:34
      */
     @Override
     public OgDutyBasis getOgDutyBasis() {
         List<OgDutyBasis> ogDutyBases = ogDutyBasisMapper.selectList(Wrappers.lambdaQuery(OgDutyBasis.class)
                 .eq(OgDutyBasis::getStatus, 2));
-        if (CollectionUtil.isNotEmpty(ogDutyBases)){
-            throw new CommonException("暂无发布数据");
+        if (CollectionUtil.isEmpty(ogDutyBases)) {
+            return null;
         }
-       return ogDutyBases.get(0);
+        return ogDutyBases.get(0);
     }
 }