From 4f4e3a3c56bb4957e89c4a0d1586b844b3385bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 16 Apr 2025 11:18:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java   | 1 -
 .../java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java   | 3 +++
 .../com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java   | 3 ++-
 .../java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml   | 6 ++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java
index e8c8bea..7df19ae 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoin.java
@@ -44,7 +44,6 @@ public class AreaJoin extends BaseEntity
 
     @Excel(name = "分成比例")
     @ApiModelProperty("分成比例")
-    @NotNull(message = "分成比例不允许为空", groups = {ValidGroup.Create.class})
     @Min(value = 0, message = "分成比例不允许小于0")
     @Max(value = 100, message = "分成比例不允许大于100")
     private BigDecimal point;
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java
index b72563c..639e0d0 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/AreaJoinQuery.java
@@ -8,6 +8,9 @@ import lombok.Data;
 @Data
 public class AreaJoinQuery extends AreaJoinVO {
 
+    @ApiModelProperty("类型列表")
+    private List<String> types;
+
     @ApiModelProperty("ID列表")
     private List<Long> ids;
 
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java
index 3bfae68..e617a22 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/domain/enums/AreaJoinType.java
@@ -7,7 +7,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum AreaJoinType {
     JOIN("1", "加盟商"),
-    PARTNER("2", "合伙人");
+    PARTNER("2", "合伙人"),
+    OPERATION("3", "运维");
 
     private String code;
     private String name;
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml
index 7ce17e6..4dca340 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/areaJoin/mapper/AreaJoinMapper.xml
@@ -47,6 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.userPhone != null and query.userPhone != ''">and su.user_name like concat('%', #{query.userPhone}, '%')</if>
         <if test="query.mchId != null">and ba.user_id = #{query.mchId}</if>
         <if test="query.excludeId != null">and baj.id != #{query.excludeId}</if>
+        <if test="query.types != null and query.types.size() > 0">
+            and baj.type in
+            <foreach item="item" collection="query.types" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="query.ids != null and query.ids.size() > 0">
             and baj.id in
             <foreach item="item" collection="query.ids" open="(" separator="," close=")">