客户添加其它负责人、添加账套编码

src/main/java/com/qs/serve/common/util/AuthContextUtils.java

@@ -101,9 +101,21 @@ public class AuthContextUtils {
         WxUserService wxUserService = SpringUtils.getBean(WxUserService.class);
         WxUser wxUser = wxUserService.getCurrentWxUser();
         BmsSupplier supplier = supplierService.getById(supplierId);
-        if(!supplier.getUserId().equals(wxUser.getSysUserId())){
+        boolean isOther = false;
+        if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){
+            for (String otherUserId : supplier.getOtherUserIds()) {
+                if(wxUser.getSysUserId().equals(otherUserId)){
+                    isOther = true;
+                    break;
+                }
+            }
+        }
+        if(isOther && !supplier.getUserId().equals(wxUser.getSysUserId())){
             Assert.throwEx("供应商无效或未授权");
         }
+        if(supplier.getStopFlag().equals(1)){
+            Assert.throwEx("供应商已停用");
+        }
         return supplier;
     }
 

src/main/java/com/qs/serve/modules/base/controller/JslApiController.java

@@ -0,0 +1,104 @@
+package com.qs.serve.modules.base.controller;
+
+import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.GySysConst;
+import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.modules.bms.entity.bo.BmsSupplierBatchBo;
+import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
+import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.entity.bo.SysUserBatchBo;
+import com.qs.serve.modules.sys.entity.bo.SysUserBo;
+import com.qs.serve.modules.sys.service.SysRoleService;
+import com.qs.serve.modules.sys.service.SysUserSalesService;
+import com.qs.serve.modules.sys.service.SysUserService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 【嘉士利对接】
+ * @author YenHex
+ * @since 2022/10/28
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("/jsl")
+public class JslApiController {
+
+    private SysUserService sysUserService;
+    private SysRoleService sysRoleService;
+    private BmsSupplierService bmsSupplierService;
+    private SysUserSalesService sysUserSalesService;
+
+    /**
+     * 客户档案
+     * @param param
+     * @return
+     */
+    @PostMapping("/supplier/editBatch")
+    @SysLog(module = SystemModule.BASE, title = "供应商", biz = BizType.INSERT)
+    @PreAuthorize("hasRole('bms:supplier:insert')")
+    public R<?> editBatch(@RequestBody @Valid BmsSupplierBatchBo param){
+        bmsSupplierService.editBatch(param);
+        return R.ok();
+    }
+
+
+
+    /**
+     * 业务员档案
+     * @param batchBo
+     * @return
+     */
+    @SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT)
+    @PostMapping("/user/editBatch")
+    @PreAuthorize("hasRole('sys:user:insert')")
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> saveBatch(@RequestBody @Valid SysUserBatchBo batchBo){
+        for (SysUserBo userBo : batchBo.getUserList()) {
+            SysUser dbData = sysUserService.getById(userBo.getId());
+            SysUser param = CopierUtil.copy(userBo,dbData==null?new SysUser():dbData);
+            //设置普通管理员
+            param.setSuperFlag(0);
+            param.setTenantId(AuthContextUtils.getTenant());
+            param.setAccount(param.getMobile());
+            param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD));
+            if(param.getMobile()!=null){
+                param.setAccount(param.getMobile());
+            }
+            //检查手机号是否已用
+            LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+            wrapper.ne(SysUser::getId,userBo.getId());
+            wrapper.eq(SysUser::getMobile,param.getMobile());
+            Long count = sysUserService.count(wrapper);
+            if(count>0L){
+                return R.error("手机号已被注册");
+            }
+            if(dbData == null){
+                sysUserService.save(param);
+            }else {
+                sysUserService.updateById(param);
+            }
+            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
+            }
+        }
+        return R.ok();
+    }
+
+}

src/main/java/com/qs/serve/modules/bms/controller/BmsRuleController.java

@@ -111,7 +111,7 @@ public class BmsRuleController {
         lqw.eq(BmsRuleRegion::getTypeFlag,type);
         List<BmsRuleRegion> ruleRegions = bmsRuleRegionService.list(lqw);
         if(CollectionUtil.isNotEmpty(ruleRegions)){
-            List<Long> regionIds = ruleRegions.stream().map(BmsRuleRegion::getRegionId).collect(Collectors.toList());
+            List<String> regionIds = ruleRegions.stream().map(BmsRuleRegion::getRegionId).collect(Collectors.toList());
             List<BmsRegion> regionList = bmsRegionService.listByIds(regionIds);
             return R.byPageHelperList(regionIds,regionList);
         }
@@ -142,8 +142,8 @@ public class BmsRuleController {
     public R<?> addItem(@RequestBody @Valid BmsRuleBo bmsRule){
         Long ruleId = bmsRule.getId();
         List<Long> skuIds = bmsRule.getSkuIds();
-        List<Long> banSaleRegionIds = bmsRule.getBanSaleRegionIds();
+        List<String> banSaleRegionIds = bmsRule.getBanSaleRegionIds();
-        List<Long> onlySaleRegionIds = bmsRule.getOnlySaleRegionIds();
+        List<String> onlySaleRegionIds = bmsRule.getOnlySaleRegionIds();
         if(CollectionUtil.isNotEmpty(bmsRule.getSkuIds())){
             List<BmsRuleSku> ruleSkuList = new ArrayList<>();
             LambdaQueryWrapper<BmsRuleSku> lqw = new LambdaQueryWrapper<>();
@@ -210,8 +210,8 @@ public class BmsRuleController {
     public R<?> removeItem(@RequestBody @Valid BmsRuleBo bmsRule){
         Long ruleId = bmsRule.getId();
         List<Long> skuIds = bmsRule.getSkuIds();
-        List<Long> banSaleRegionIds = bmsRule.getBanSaleRegionIds();
+        List<String> banSaleRegionIds = bmsRule.getBanSaleRegionIds();
-        List<Long> onlySaleRegionIds = bmsRule.getOnlySaleRegionIds();
+        List<String> onlySaleRegionIds = bmsRule.getOnlySaleRegionIds();
         if(CollectionUtil.isNotEmpty(bmsRule.getSkuIds())){
             LambdaQueryWrapper<BmsRuleSku> lqw = new LambdaQueryWrapper<>();
             lqw.eq(BmsRuleSku::getRuleId,ruleId);

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -17,6 +17,7 @@ import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
+import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam3;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -179,6 +180,19 @@ public class BmsSupplierController {
         return R.ok();
     }
 
+    /**
+     * 更改客户其它用户授权
+     * @return
+     */
+    @PostMapping("/relateOtherUsers")
+    @PreAuthorize("hasRole('bms:supplier:update')")
+    public R<?> relateOtherUsers(@RequestBody SysRelateSuppliersParam3 param){
+        BmsSupplier bmsSupplier = new BmsSupplier();
+        bmsSupplier.setId(param.getSupplierId().toString());
+        bmsSupplier.setOtherUserIds(param.getUserIds());
+        return R.ok();
+    }
+
     /**
      * 根据ID查询
      * @param id
@@ -268,18 +282,7 @@ public class BmsSupplierController {
         return R.ok();
     }
 
-    /**
+
-     * 批量编辑
-     * @param param
-     * @return
-     */
-    @PostMapping("/editBatch")
-    @SysLog(module = SystemModule.BASE, title = "供应商", biz = BizType.INSERT)
-    @PreAuthorize("hasRole('bms:supplier:insert')")
-    public R<?> editBatch(@RequestBody @Valid BmsSupplierBatchBo param){
-        bmsSupplierService.editBatch(param);
-        return R.ok();
-    }
 
     /**
      * 显示关联

src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierApi.java

@@ -48,6 +48,7 @@ public class BmsSupplierApi {
             return R.byEmptyList();
         }
         param.setCurrUserId(wxUser.getSysUserId());
+        param.setStopFlag(0);
         PageUtil.startPage();
         List<BmsSupplier> list = bmsSupplierService.selectSupplierList(param);
         return R.byPageHelperList(list);

src/main/java/com/qs/serve/modules/bms/entity/BmsRuleRegion.java

@@ -35,7 +35,7 @@ public class BmsRuleRegion implements Serializable {
 
     /** 区域ID */
     @NotNull(message = "区域ID不能为空")
-    private Long regionId;
+    private String regionId;
 
     /** 类型：0->只售；1->禁售 */
     @NotNull(message = "类型：0->只售；1->禁售不能为空")

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,7 +22,7 @@ import javax.validation.constraints.NotBlank;
  * @since 2022-10-11
  */
 @Data
-@TableName("bms_supplier")
+@TableName(value = "bms_supplier",autoResultMap = true)
 public class BmsSupplier implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -68,6 +70,15 @@ public class BmsSupplier implements Serializable {
     /** 负责人 */
     private String userName;
 
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] otherUserIds;
+
+    /** 停用 */
+    private Integer stopFlag;
+
+    /** 所属账套 */
+    private String belong;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRuleBo.java

@@ -24,9 +24,9 @@ public class BmsRuleBo {
     private List<Long> skuIds;
 
     /** 只售区域id */
-    private List<Long> onlySaleRegionIds;
+    private List<String> onlySaleRegionIds;
 
     /** 禁售区域id */
-    private List<Long> banSaleRegionIds;
+    private List<String> banSaleRegionIds;
 
 }

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBatchBo.java

@@ -26,21 +26,21 @@ public class BmsSupplierBatchBo {
         @Length(max = 20,message = "客户编码长度不能超过20字")
         private String code;
 
-        /** 父级编码,空表无父级 */
+        /** 客户父级编码（空为无父级） */
         private String parentCode;
 
-        /** 区域ID */
+        /** 区域编码 */
-        private Long regionId;
+        private Long regionCode;
 
-        /** 详细地址 */
+        /** 客户地址 */
         private String address;
 
-        /** 名称 */
+        /** 客户名称 */
         @NotBlank(message = "名称不能为空")
         private String name;
 
-        /** 归属ERP编码,如JSL、JSB、KL 对应ERP信息表作显示 */
+        /** 账套编码 */
-        @NotBlank(message = "名称不能为空")
+        @NotBlank(message = "账套编码不能为空")
         private String belong;
 
     }

src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java

@@ -39,4 +39,7 @@ public class BmsSupplierBo {
     /** 负责人ID */
     private String mgrId;
 
+    /** 其它负责人 */
+    private String[] otherMgrIds;
+
 }

src/main/java/com/qs/serve/modules/bms/service/BmsSupplierService.java

@@ -18,7 +18,7 @@ public interface BmsSupplierService extends IService<BmsSupplier> {
 
     void edit(BmsSupplierBo param);
 
-    BmsSupplier getByCode(String code);
+    BmsSupplier getByCode(String code,String belong);
 
     List<BmsSupplier> listChild(String pid);
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.bms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
@@ -47,6 +48,9 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
             supplier.setUserName(sysUser.getName());
             supplier.setUserCode(sysUser.getCode());
         }
+        if(CollectionUtil.isNotEmpty(param.getOtherMgrIds())){
+            supplier.setOtherUserIds(param.getOtherMgrIds());
+        }
         if(!StringUtils.hasText(supplier.getId())){
             if(param.getPid()==null||param.getPid().equals(0L)){
                 supplier.setPid("0");
@@ -60,15 +64,16 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
             supplier.setParentCode(null);
         }
         if(param.getRegionId()!=null){
-            this.initRegion(supplier,param.getRegionId());
+            this.initRegion(supplier,param.getRegionId().toString());
         }
         this.saveOrUpdate(supplier);
     }
 
     @Override
-    public BmsSupplier getByCode(String code) {
+    public BmsSupplier getByCode(String code,String belong) {
         LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();
         lqw.eq(BmsSupplier::getCode,code);
+        lqw.eq(BmsSupplier::getBelong,belong);
         return this.getOne(lqw,false);
     }
 
@@ -92,15 +97,16 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
     @Override
     public void editBatch(BmsSupplierBatchBo batchBo) {
         for (BmsSupplierBatchBo.BmsSupplierDto param : batchBo.getSupplierList()) {
-            BmsSupplier dbSupplier = this.getByCode(param.getCode());
+            BmsSupplier dbSupplier = this.getByCode(param.getCode(),param.getBelong());
-            BmsSupplier parentNode = this.getByCode(param.getParentCode());
+            BmsSupplier parentNode = this.getByCode(param.getParentCode(),param.getBelong());
             BmsSupplier supplier = CopierUtil.copy(param,dbSupplier==null?new BmsSupplier():dbSupplier);
             if(parentNode!=null){
                 supplier.setPid(parentNode.getId());
             }else {
                 supplier.setPid("-1");
             }
-            this.initRegion(supplier,param.getRegionId());
+            BmsRegion region = regionService.getByCode(param.getCode());
+            this.initRegion(supplier,region.getId());
             if(supplier.getId()!=null){
                 this.updateById(supplier);
             }else {
@@ -116,7 +122,7 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         lqw.eq(BmsSupplier::getPid,"-1");
         List<BmsSupplier> suppliers = this.list(lqw);
         for (BmsSupplier supplier : suppliers) {
-            BmsSupplier parentSupplier = this.getByCode(supplier.getParentCode());
+            BmsSupplier parentSupplier = this.getByCode(supplier.getParentCode(),supplier.getBelong());
             if(parentSupplier==null){
                 log.warn("无效的供应商父级编码：{}",supplier.getParentCode());
                 supplier.setPid("0");
@@ -132,7 +138,7 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
      * @param supplier
      * @param regionId
      */
-    private void initRegion(BmsSupplier supplier,Long regionId){
+    private void initRegion(BmsSupplier supplier,String regionId){
         BmsRegion region1 = regionService.getById(regionId);
         if(region1==null){
             supplier.setRegionFirst("0");
@@ -145,7 +151,7 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         if(region1.getLevel()!=3){
             Assert.throwEx("供应商需选择第三级区域");
         }
-        supplier.setRegionLast(regionId+"");
+        supplier.setRegionLast(regionId);
         supplier.setRegionFirst(region2.getPid());
         supplier.setRegionSecond(region2.getId());
         supplier.setRegionThird(region1.getId());

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -361,47 +361,6 @@ public class SysUserController {
         return R.isTrue(result);
     }
 
-    /**
-     * (批量)保存,建议每次小于800条
-     * @param batchBo
-     * @return
-     */
-    @SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT)
-    @PostMapping("/saveBatch")
-    @PreAuthorize("hasRole('sys:user:insert')")
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> saveBatch(@RequestBody @Valid SysUserBatchBo batchBo){
-        for (SysUserBo userBo : batchBo.getUserList()) {
-            SysUser dbData = sysUserService.getById(userBo.getId());
-            SysUser param = CopierUtil.copy(userBo,dbData==null?new SysUser():dbData);
-            //设置普通管理员
-            param.setSuperFlag(0);
-            param.setTenantId(AuthContextUtils.getTenant());
-            param.setAccount(param.getMobile());
-            param.setPassword(SecureUtil.md5(GySysConst.DEFAULT_PASSWORD));
-            if(param.getMobile()!=null){
-                param.setAccount(param.getMobile());
-            }
-            //检查手机号是否已用
-            LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
-            wrapper.ne(SysUser::getId,userBo.getId());
-            wrapper.eq(SysUser::getMobile,param.getMobile());
-            Long count = sysUserService.count(wrapper);
-            if(count>0L){
-                return R.error("手机号已被注册");
-            }
-            if(dbData == null){
-                sysUserService.save(param);
-            }else {
-                sysUserService.updateById(param);
-            }
-            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
-                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
-            }
-        }
-        return R.ok();
-    }
-
     /**
      * 重置密码
      * @param uid

src/main/java/com/qs/serve/modules/sys/entity/SysDict.java

@@ -33,7 +33,7 @@ public class SysDict implements Serializable {
     /**  */
     @TableField(value = "key_val")
     @Length(max = 50,message = "长度不能超过50字")
-    private String key;
+    private String keyVal;
 
     /**  */
     @Length(max = 50,message = "长度不能超过50字")

src/main/java/com/qs/serve/modules/sys/entity/bo/SysRelateSuppliersParam3.java

@@ -0,0 +1,25 @@
+package com.qs.serve.modules.sys.entity.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author YenHex
+ * @since 2022/10/25
+ */
+@Data
+public class SysRelateSuppliersParam3 {
+
+    /**
+     * 删除传入空数组
+     */
+    String[] userIds;
+
+    /**
+     * 供应商id列表
+     */
+    @NotNull
+    Long supplierId;
+
+}

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -4,6 +4,8 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qs.serve.modules.bms.mapper.BmsSupplierMapper">
 
+
+
     <resultMap id="bmsSupplierMap" type="com.qs.serve.modules.bms.entity.BmsSupplier" >
         <result property="id"  column="id"/>
         <result property="regionFirst"  column="region_first"/>
@@ -14,12 +16,19 @@
         <result property="code"  column="code"/>
         <result property="pid"  column="pid"/>
         <result property="parentCode"  column="parent_code"/>
+        <result property="userId"  column="user_id"/>
+        <result property="userCode"  column="user_code"/>
+        <result property="userName"  column="user_name"/>
+        <result property="stopFlag"  column="stop_flag"/>
+        <result property="belong"  column="belong"/>
+        <result property="otherUserIds"  column="other_user_ids" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
         <result property="createTime"  column="create_time"/>
         <result property="createBy"  column="create_by"/>
         <result property="updateTime"  column="update_time"/>
         <result property="updateBy"  column="update_by"/>
         <result property="tenantId"  column="tenant_id"/>
         <result property="delFlag"  column="del_flag"/>
+
     </resultMap>
 
     <sql id="bmsSupplierSql">
@@ -32,6 +41,12 @@
         bms_supplier.`code`,
         bms_supplier.`pid`,
         bms_supplier.`parent_code`,
+        bms_supplier.`user_id`,
+        bms_supplier.`user_code`,
+        bms_supplier.`user_name`,
+        bms_supplier.`other_user_ids`,
+        bms_supplier.`stop_flag`,
+        bms_supplier.`belong`,
         bms_supplier.`create_time`,
         bms_supplier.`create_by`,
         bms_supplier.`update_time`,
@@ -54,6 +69,8 @@
             <if test="query.code != null and query.code != ''"> and `bms_supplier`.`code` = #{query.code}</if>
             <if test="query.pid != null"> and `bms_supplier`.`pid` = #{query.pid}</if>
             <if test="query.parentCode != null and query.parentCode != ''"> and `bms_supplier`.`parent_code` = #{query.parentCode}</if>
+            <if test="query.stopFlag != null"> and `bms_supplier`.`stop_flag` = #{query.stopFlag}</if>
+            <if test="query.belong != null"> and `bms_supplier`.`belong` = #{query.belong}</if>
             <if test="query.createTime != null"> and `bms_supplier`.`create_time` = #{query.createTime}</if>
             <if test="query.createBy != null and query.createBy != ''"> and `bms_supplier`.`create_by` = #{query.createBy}</if>
             <if test="query.updateTime != null"> and `bms_supplier`.`update_time` = #{query.updateTime}</if>
@@ -61,7 +78,7 @@
             <if test="query.tenantId != null and query.tenantId != ''"> and `bms_supplier`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.delFlag != null"> and `bms_supplier`.`del_flag` = #{query.delFlag}</if>
             <if test="query.currUserId!=null and query.currUserId != ''">
-                and `bms_supplier_user`.`user_id` = #{query.currUserId}
+                and (`bms_supplier`.`user_id` = #{query.currUserId} or FIND_IN_SET(#{query.currUserId},`bms_supplier`.`other_user_ids`) )
             </if>
         </where>
     </select>