cid修复bug

fs-admin/src/main/java/com/fs/his/controller/EasyCallController.java

@@ -46,8 +46,14 @@ public class EasyCallController extends BaseController {
     @ApiOperation("获取网关列表")
     @GetMapping("/gateway/list")
     public R getGatewayList() {
-        List<EasyCallGatewayVO> list = easyCallService.getGatewayList(null);
-        return R.ok().put("data", list);
+        try {
+            List<EasyCallGatewayVO> list = easyCallService.getGatewayList(null);
+            return R.ok().put("data", list);
+        }
+        catch (Exception e){
+            log.error("获取网关列表失败", e);
+            return R.ok().put("msg", e.getMessage());
+        }
     }
 
     /**

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

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isNeedRegisterMember"    column="is_need_register_member" />
         <result property="isAllowedAllRegister"    column="is_allowed_all_register" />
         <result property="cidServerId" column="cid_server_id"/>
+        <result property="aiSipCallUserId" column="ai_sip_call_user_id"/>
         <collection property="roleNames" ofType="java.lang.String" javaType="java.util.ArrayList"
                     select="selectUserRoles" column="user_id"/>
     </resultMap>
@@ -104,7 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.dept_name,
         d.leader,
         GROUP_CONCAT(fu.nick_name) bindUser,
-        cfu.`status` bindStatus
+        cfu.`status` bindStatus,
+        u.cid_server_id,
+        u.ai_sip_call_user_id
         from
         company_user u
         left join