bug

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUserVO.java

@@ -289,4 +289,10 @@ public class TaUserVO implements Serializable {
      */
     @TableField(exist = false)
     private String bossDisplay;
+
+    /**
+     * ta_user 的 userId
+     */
+    @TableField(exist = false)
+    private Integer realUserId;
 }

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

@@ -236,7 +236,7 @@ public class CustomerInfoController extends BaseController {
                 customerInfo = new CustomerInfo();
             }
             customerInfo.setName(customer.getName());
-            customerInfo.setSex(customer.getSex());
+//            customerInfo.setSex(customer.getSex());
             customerInfo.setPhone(customer.getPhone());
             customerInfo.setPicture(customer.getPicture());
 
@@ -274,7 +274,7 @@ public class CustomerInfoController extends BaseController {
                 customerInfoVO.setRealtyConsultantPerson(realtyPerson);
                 // 所属楼盘和 用户信息
                 LambdaQueryWrapper<TaPersonBuilding> taPersonBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant());
+                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant()).or().eq(TaPersonBuilding::getUserId,realtyPerson.getUserId());
                 List<TaPersonBuilding> list = taPersonBuildingService.list(taPersonBuildingLambdaQueryWrapper);
                 if (list.size() > 0) {
                     TaUser taUser = taUserService.getById(list.get(0).getUserId());

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -367,7 +367,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         customerPreparatory.setOrgId(taRecommendCustomer.getOrgId());
         customerPreparatory.setCustomerId(taRecommendCustomer.getCustomerId());
-        customerPreparatoryMapper.insert(customerPreparatory);
+        if (StringUtils.isEmpty(customerPreparatory.getCustomerPreparatoryId())) {
+            customerPreparatoryMapper.insert(customerPreparatory);
+        }else {
+            customerPreparatoryMapper.updateById(customerPreparatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
@@ -406,7 +411,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatory.setType("commission");
-        customerSignatoryMapper.insert(customerSignatory);
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())){
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 
@@ -447,7 +457,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         customerSignatory.setOrgId(taRecommendCustomer.getOrgId());
         customerSignatory.setType("signatory");
-        customerSignatoryMapper.insert(customerSignatory);
+        if (StringUtils.isEmpty(customerSignatory.getCustomerSignatoryId())) {
+            customerSignatoryMapper.insert(customerSignatory);
+        }else {
+            customerSignatoryMapper.updateById(customerSignatory);
+        }
+
         return ResponseBean.success("审核成功");
     }
 

src/main/resources/mapper/TaUserMapper.xml

@@ -161,6 +161,7 @@
     <select id="selectPageList" resultType="com.yunzhi.marketing.center.taUser.entity.TaUserVO">
         SELECT
             s.person_id as user_id,
+            t.user_id as real_user_id,
             t.*
         FROM
             ta_user t