1.修复专场合作申请bugfix

2.修复专场登陆错误提示

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -352,7 +352,7 @@ public class AuthServiceImpl implements IAuthService {
             List<String> specials = Arrays.asList(special.split(Global.COMMA));
             if (!specials.contains(accessSpecial)) {
                 StringBuilder msg = new StringBuilder();
-                msg.append("请进入");
+//                msg.append("请进入");
                 for (String e : specials) {
                     specialResVos.stream().filter(ee -> {
                         return e.equals(ee.getCode());

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntRegisterReqVo.java

@@ -107,7 +107,7 @@ public class EntRegisterReqVo implements Serializable {
     /**
      * 专属客户经理（用户ID）
      */
-    private long manager;
+    private Long manager;
 
     /**
      * 备注

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1171,7 +1171,12 @@ public class KwsEnterpriseService {
             if (CollectionUtils.isEmpty(entIds)) {
                 return Collections.emptyList();
             }
-            kwsEnterprises = kwsEnterprises.stream().filter(item -> !entIds.contains(item.getId())).collect(Collectors.toList());
+//            kwsEnterprises = kwsEnterprises.stream().filter(item -> !entIds.contains(item.getId())).collect(Collectors.toList());
+            List<Long> longList = kwsEnterprises.stream().map(KwsEnterprise::getId).distinct().collect(Collectors.toList());
+            List<Long> intersection = longList.stream()
+                    .filter(entIds::contains)
+                    .collect(Collectors.toList());
+            kwsEnterprises = kwsEnterpriseDao.selectByKeys(intersection);
         } else {
             //求交集数据
             List<Long> entIds = remoteSystemService.queryEntIdsByCode(accessSpecial, null);