From 0dde8aa0724f359d6a859ef26a54bfd232490ff7 Mon Sep 17 00:00:00 2001
From: username <1532322479@qq.com>
Date: Fri, 19 Jul 2024 16:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bs/df/controller/DfBizClueController.java | 24 ++++++++++++++++++-
 .../main/java/com/bs/df/domain/DfBizClue.java | 10 ++++++++
 .../broker/broker/components/BrokerUser.vue   |  2 +-
 bs-ui/src/views/system/user/index.vue         |  5 +++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java
index 17a1f7f..e286c4d 100644
--- a/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java
+++ b/bs-admin/src/main/java/com/bs/df/controller/DfBizClueController.java
@@ -87,10 +87,16 @@ public class DfBizClueController extends BaseController {
         Integer pageSize = ServletUtils.getParameterToInt(Constants.PAGE_SIZE);
         LambdaQueryWrapper<DfBizClue> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(DfBizClue::getDataType,dfBizClue.getDataType());
-        queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId());
         //传入hasOrder参数为1时，查询出存在orderId的数据
         if (Validator.isNotEmpty(dfBizClue.getHasOrder())) {
             queryWrapper.isNotNull(DfBizClue::getOrderId);
+            if (Validator.isNotEmpty(dfBizClue.getBrokerId())) {
+                queryWrapper.eq(DfBizClue::getShareUser,dfBizClue.getBrokerId());
+            } else {
+                queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId());
+            }
+        } else {
+            queryWrapper.eq(DfBizClue::getShareUser,SecurityUtils.getUserId());
         }
         List<DfBizClue> list = dfBizClueService.list(queryWrapper);
         Map<String, Integer> visitsNum = new HashMap<>();
@@ -234,6 +240,22 @@ public class DfBizClueController extends BaseController {
         return toAjax(dfBizClueService.updateById(dfBizClue));
     }
 
+    /**
+     * 修改经济人ID
+     */
+    @ApiOperation("经济人ID")
+    @PostMapping("/changeUserId")
+    public AjaxResult changeUserId(@RequestBody DfBizClue dfBizClue) {
+        List<DfBizClue> list = dfBizClueService.list(new LambdaQueryWrapper<DfBizClue>().eq(DfBizClue::getShareUser, dfBizClue.getOldUserId()));
+        if (list.size() > 0) {
+            for (DfBizClue dfBizClueNew : list) {
+                dfBizClueNew.setShareUser(dfBizClue.getNewUserId());
+            }
+            dfBizClueService.updateBatchById(list);
+        }
+        return toAjax(true);
+    }
+
     /**
      * 删除业务线索
      */
diff --git a/bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java b/bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java
index 9916e7b..9428ef4 100644
--- a/bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java
+++ b/bs-admin/src/main/java/com/bs/df/domain/DfBizClue.java
@@ -129,4 +129,14 @@ public class DfBizClue extends BaseEntity{
     @TableField(exist = false)
     private String hasOrder;
 
+    @TableField(exist = false)
+    private String oldUserId;
+
+    @TableField(exist = false)
+    private String newUserId;
+
+
+    @TableField(exist = false)
+    private Long brokerId;
+
 }
diff --git a/bs-ui/src/views/broker/broker/components/BrokerUser.vue b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
index 26f9c64..1df899e 100644
--- a/bs-ui/src/views/broker/broker/components/BrokerUser.vue
+++ b/bs-ui/src/views/broker/broker/components/BrokerUser.vue
@@ -273,7 +273,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色" style="width: 100%" :disabled="readonly">
                 <el-option
                     v-for="item in roleOptions"
diff --git a/bs-ui/src/views/system/user/index.vue b/bs-ui/src/views/system/user/index.vue
index d0783a7..b7b3aa3 100644
--- a/bs-ui/src/views/system/user/index.vue
+++ b/bs-ui/src/views/system/user/index.vue
@@ -281,7 +281,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
@@ -431,6 +431,9 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
+        roleIds: [
+          { required: true, message: "角色不能为空", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }