Merge pull request 'dpx20260211' (#22) from dpx20260211 into master

Reviewed-on: #22

doc/新增表和数据字段在此说明.txt

@@ -28,9 +28,4 @@ width                      varchar                60                  单元格
 日期：2026-02-24（新增字段）
 表名：yunji_report_field
 字段                        类型                   长度                  字段说明
-search_default_value      varchar                 150                 查询控件默认值
------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-日期：2026-02-27（新增字段）
-表名：yunji_report_field
-字段                        类型                   长度                  字段说明
-is_hide_search            varchar                 60                查询控件是否隐藏
+searchDefaultValue        varchar                 150                 查询控件默认值

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java

@@ -116,8 +116,5 @@ public class ReportFieldEntity extends BaseTenantEntity {
     //查询控件默认值
     private String searchDefaultValue;
 
-    //查询控件隐藏
-    private String isHideSearch;
-
 }
 

lidee-core/src/main/java/com/lideeyunji/core/framework/params/vo/ReportFieldVo.java

@@ -81,8 +81,5 @@ public class ReportFieldVo extends ReportFieldIdVo {
     //查询控件默认值
     private String searchDefaultValue;
 
-    //查询控件隐藏
-    private String isHideSearch;
-
 }
 

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java

@@ -383,7 +383,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportEntity> i
             entity.setFixedColumnValue(vo.getFixedColumnValue());  //2026-02-10  新增
             entity.setIsHideCol(vo.getIsHideCol());  //2026.2.10  新增
             entity.setSearchDefaultValue(vo.getSearchDefaultValue());
-            entity.setIsHideSearch(vo.getIsHideSearch());
             entity.setWidth(vo.getWidth());
             entity.setIsDynamicGroup(vo.getIsDynamicGroup());
             entity.setHasChildren(vo.getHasChildren());

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/mapper/OAuth2ClientMapper.java

@@ -22,6 +22,7 @@ public interface OAuth2ClientMapper extends BaseMapperX<OAuth2ClientDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<OAuth2ClientDO>()
                 .likeIfPresent(OAuth2ClientDO::getName, reqVO.getName())
                 .eqIfPresent(OAuth2ClientDO::getStatus, reqVO.getStatus())
+                .neIfPresent(OAuth2ClientDO::getClientId, "default")
                 .inIfPresent(OAuth2ClientDO::getId, reqVO.getIds())
                 .orderByDesc(OAuth2ClientDO::getId));
     }