到家了需求

fs-ai-call-task/src/main/resources/application.yml

@@ -14,6 +14,6 @@ spring:
 #    active: druid-sxjz
 #    active: druid-hdt
 #    active: druid-myhk-test
-cid-group-no: 5
+cid-group-no: 3
 # 配置了服务标记后，请在tenant_service_config 中配置服务应用租户ids信息
 tenant-service-marker: aiCall00

fs-cid-workflow/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
 #    active: druid-sxjz
 #    active: druid-hdt
 #    active: druid-myhk-test
-cid-group-no: 5
+cid-group-no: 3
 tenant-id: 11
 # 配置了服务标记后，请在tenant_service_config 中配置服务应用租户ids信息
 tenant-service-marker: cidWorkflow00

fs-company/src/main/java/com/fs/company/controller/company/CompanyVoiceRoboticController.java

@@ -234,7 +234,13 @@ public class CompanyVoiceRoboticController extends BaseController
      */
     @GetMapping("/companyUserList")
     public R qwUserList(){
-        return R.ok().put("data", companyVoiceRoboticService.qwUserListCompany(new CompanyVoiceRobotic()));
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long companyId = loginUser.getCompany().getCompanyId();
+        Long userId = loginUser.getUser().getUserId();
+        CompanyVoiceRobotic robotic = new CompanyVoiceRobotic();
+        robotic.setCompanyId(companyId);
+        robotic.setCompanyUserId(userId);
+        return R.ok().put("data", companyVoiceRoboticService.qwUserListCompany(robotic));
     }
 
     /**

fs-company/src/main/java/com/fs/company/controller/crm/CrmCustomerController.java

@@ -118,6 +118,12 @@ public class CrmCustomerController extends BaseController
     @PreAuthorize("@ss.hasPermi('crm:customer:list')")
     @GetMapping("/listAll")
     public R listAll(CrmCustomerListQueryParam crmCustomer){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        crmCustomer.setCompanyId(loginUser.getCompany().getCompanyId());
+
+        if (!CompanyUser.isAdmin(loginUser.getUser().getUserType())) {
+            crmCustomer.setCustomerUserId(loginUser.getUser().getUserId());
+        }
         PageHelper.startPage(1, 1000);
         if(!StringUtils.isEmpty(crmCustomer.getReceiveTimeRange())){
             crmCustomer.setReceiveTimeList(crmCustomer.getReceiveTimeRange().split("--"));

fs-service/src/main/java/com/fs/company/service/impl/call/node/AiCallTaskNode.java

@@ -363,8 +363,8 @@ public class AiCallTaskNode extends AbstractWorkflowNode {
         // 构建号码条目，bizJson 传入默认客户信息占位符
         EasyCallPhoneItemVO phoneItem = new EasyCallPhoneItemVO();
         // todo
-//        phoneItem.setPhoneNum(PhoneUtil.decryptPhone(callees.getPhone()));
-        phoneItem.setPhoneNum(callees.getPhone());
+        phoneItem.setPhoneNum(PhoneUtil.decryptPhone(callees.getPhone()));
+//        phoneItem.setPhoneNum(callees.getPhone());
         // bizJson 默认传入客户姓名占位，运行时可根据实际业务填充
         phoneItem.setBizJson(new JSONObject().fluentPut("custName", callees.getUserName()).fluentPut("tenantId", TenantHelper.getTenantId()).fluentPut("callBackUuid",callBackUuid).fluentPut("callBackUrl",callBackUrl));
         addListParam.setPhoneList(Collections.singletonList(phoneItem));

fs-service/src/main/java/com/fs/crm/mapper/CrmCustomerMapper.java

@@ -232,6 +232,9 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer> {
             "<if test = 'maps.customerName != null and  maps.customerName !=\"\"    '> " +
             "and c.customer_name like CONCAT('%',#{maps.customerName},'%') " +
             "</if>" +
+            "<if test = 'maps.customerUserId != null and maps.customerUserId !=\"\"     '> " +
+            "and c.receive_user_id =#{maps.customerUserId} " +
+            "</if>" +
             "<if test = 'maps.companyUserNickName != null and  maps.companyUserNickName !=\"\"    '> " +
             "and cu.nick_name like CONCAT(#{maps.companyUserNickName},'%') " +
             "</if>" +

fs-service/src/main/resources/mapper/company/AiOutboundCallDashboardMapper.xml

@@ -136,7 +136,7 @@
                 WHEN ccl.call_time > 120 AND ccl.call_time <= 300 THEN '2-5分钟'
                 WHEN ccl.call_time > 300 THEN '5分钟以上'
                 ELSE '未接通'
-            END AS 
ange,
+            END AS `range`,
             COUNT(*) AS count
         FROM company_voice_robotic_call_log_callphone ccl
         WHERE ccl.company_id = #{companyId}
@@ -152,7 +152,7 @@
                 ELSE '未接通'
             END
         ORDER BY
-            FIELD(
ange, '0-30秒', '30-60秒', '1-2分钟', '2-5分钟', '5分钟以上', '未接通')
+            FIELD(`range`, '0-30秒', '30-60秒', '1-2分钟', '2-5分钟', '5分钟以上', '未接通')
     </select>
 
 </mapper>

fs-service/src/main/resources/mapper/company/CompanyVoiceRoboticMapper.xml

@@ -108,6 +108,8 @@
         inner join company_user u on a.company_user_id = u.user_id
         inner join company_dept d on u.dept_id = d.dept_id
         <where>
+            <if test="companyId != null"> and a.company_id = #{companyId}</if>
+            <if test="companyUserId != null"> and a.company_user_id = #{companyUserId}</if>
             <if test="params != null">${params.dataScope}</if>
         </where>
     </select>