* bug fix

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -440,8 +440,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean assistConsultant(@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request) {
         try {
             Integer orgId = getOrgId(request);
-            taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
-            return ResponseBean.success("");
+            return taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -458,8 +457,8 @@ public class TaRecommendCustomerController extends BaseController {
         }
         try {
             Integer orgId = getOrgId(request);
-            taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
-            return ResponseBean.success("");
+            return taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
+
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -852,6 +852,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         logger.info("公客分配置业顾问 接收参数，taUser={}，customerId={}，orgId={}",
                 JSONObject.toJSONString(taUser), customerId, orgId);
 
+        ResponseBean responseBean = new ResponseBean();
+
         // 1.校验置业顾问
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", taUser.getUserId());
@@ -862,7 +864,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
 
         if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus()) {
-            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+            responseBean.addError("置业顾问不存在或已被注销");
+            return responseBean;
         }
 
         // 2.根据customerId获取personId
@@ -872,14 +875,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaRecommendCustomer customerInfo = taRecommendCustomerMapper.selectOne(customerQueryWrapper);
         if (customerInfo == null) {
             logger.info("公客分配置业顾问 customerInfo为空");
-            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
 
         // 3.判断是否有buildingId,有则直接更新数据
         if (!StringUtils.isEmpty(customerInfo.getBuildingId())) {
             logger.info("公客分配置业顾问 customer={}", JSONObject.toJSONString(customerInfo));
             customerInfo.setRealtyConsultant(userInfo.getUserId().toString());
-            return ResponseBean.success(taRecommendCustomerMapper.updateById(customerInfo));
+            responseBean.addSuccess(taRecommendCustomerMapper.updateById(customerInfo));
+            return responseBean;
         }
 
         // 4.校验公客是否已经是分配项目下的私客
@@ -892,15 +897,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         customerQueryWrapper2.isNotNull("realty_consultant");
         TaRecommendCustomer customerInfo2 = taRecommendCustomerMapper.selectOne(customerQueryWrapper2);
         if (customerInfo2 != null) {
-            logger.info("公客分配置业顾问 customerInfo2为空");
-            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            logger.info("客户已在当前项目私客中，可以继续分配给其他项目");
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
 
         // 5.无buildingId，新增一条私客数据
         TaPerson taPerson = taPersonMapper.getById(customerInfo.getPersonId());
         if (taPerson == null) {
             logger.info("公客分配置业顾问 taPerson为空");
-            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
@@ -925,9 +932,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
-            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
-        return ResponseBean.success(taRecommendCustomer);
+        responseBean.addSuccess(taRecommendCustomer);
+        return responseBean;
     }
 
     private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {