2 Commits 49b05fcc17 ... 37a2a0bbb6

Author SHA1 Message Date
  dongpo 37a2a0bbb6 1、分页移动端模糊查询-通用审批 1 year ago
  dongpo e1204257f5 1、开启api访问日志 1 year ago

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalPageReqVO.java

@@ -46,4 +46,6 @@ public class OaUniversalPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串,主要用于移动端")
+    private String str;
 }

+ 14 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java

@@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.bpm.dal.mysql.oa.universal;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -27,6 +28,18 @@ public interface OaUniversalMapper extends BaseMapperX<OaUniversalDO> {
                 .eqIfPresent(OaUniversalDO::getAuditStatus, reqVO.getAuditStatus())
                 .betweenIfPresent(OaUniversalDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaUniversalDO::getId);
+
+        // 根据员工姓名、标题、描述模糊查询,主要用于移动端查询
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaUniversalDO::getEmployeeName, str)
+                            .or()
+                            .like(OaUniversalDO::getTitle, str)
+                            .or()
+                            .like(OaUniversalDO::getDescription, str));
+        }
+
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 1 - 1
yudao-server/src/main/resources/application-local.yaml

@@ -229,7 +229,7 @@ yudao:
     order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   access-log: # 访问日志的配置项
-    enable: false
+    enable: true
   demo: false # 关闭演示模式
   tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
 

+ 1 - 1
yudao-server/src/main/resources/application-prod.yaml

@@ -236,7 +236,7 @@ yudao:
     order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   access-log: # 访问日志的配置项
-    enable: false
+    enable: true
   demo: false # 关闭演示模式
   tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
 

+ 1 - 1
yudao-server/src/main/resources/application-test.yaml

@@ -229,7 +229,7 @@ yudao:
     order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
     refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   access-log: # 访问日志的配置项
-    enable: false
+    enable: true
   demo: false # 关闭演示模式
   tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
 

+ 1 - 1
yudao-server/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: yudao-server
 
   profiles:
-    active: test
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。