Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

gic-platform-auth-service/src/main/resources/mapper/TabSysCollaboratorMapper.xml

@@ -183,7 +183,7 @@
     a.collaboration_enterprise_id collaborationEnterpriseId,
     b.enterprise_name collaborationEnterpriseName,
     a.phone phone,
-    a.appId appId,
+    a.app_id appId,
     a.app_name appName,
     a.creator,
     a.status,
@@ -191,7 +191,7 @@
 
     from tab_sys_collaborator a
     left join tab_enterprise b on a.collaboration_enterprise_id = b.enterprise_id
-    where  enterprise_id = #{enterpriseId}
+    where  a.enterprise_id = #{enterpriseId}
     <if test="search != null and search != '' ">
       and (a.collaborator_name like concat('%', search, '%') or a.phone like concat('%', search, '%') or b.enterprise_name like concat('%', search, '%') )
     </if>

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java

 package com.gic.auth.web.controller;
 
+import com.gic.enterprise.utils.UserDetailUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ public class CollaboratorController {
 
     @RequestMapping("/list")
     public RestResponse list(CollaboratorListQO params) {
+        params.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         return ResultControllerUtils.commonResult(collaboratorApiService.page(params));
     }
 }