cid

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

@@ -311,7 +311,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-service/src/main/resources/mapper/company/CompanyVoiceRoboticMapper.xml

@@ -108,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        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>