From 333f29d6ad5d82920539b765ab1d7168097aecc9 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 21 Apr 2023 12:57:19 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=8F=90=E9=AB=98?=
 =?UTF-8?q?=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/kicc/commonbiz/api/entity/PushChatMessage.java    | 2 +-
 .../com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java | 4 ++--
 .../com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java | 2 +-
 .../src/main/resources/mapper/PushConcernFanMapper.xml      | 6 +++++-
 .../com/cloud/kicc/system/controller/TenantController.java  | 2 +-
 .../com/cloud/kicc/system/controller/UserController.java    | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
index 994a6caf..4c361fc6 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
@@ -36,7 +36,7 @@ public class PushChatMessage extends CommonEntity {
     @ApiModelProperty("消息类型")
     private String type;
 
-    @ApiModelProperty("审核状态：类型待顶")
+    @ApiModelProperty("审核状态")
     private Integer status;
 
     @ApiModelProperty("查看状态 0-未读 1-已读")
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java
index 38384e16..8d762fd0 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushConcernFan.java
@@ -33,10 +33,10 @@ public class PushConcernFan extends CommonEntity {
     @ApiModelProperty("粉丝用户")
     private String fanUserId;
 
-    @ApiModelProperty("关注类型: 0-用户关注 1-内部企业关注")
+    @ApiModelProperty("关注类型")
     private String type;
 
-    @ApiModelProperty("审核状态：-1-驳回  0-需要审核 1-审核通过")
+    @ApiModelProperty("审核状态")
     private Integer status;
 
 }
diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
index 884bfef9..5ce22d56 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushEnterprise.java
@@ -49,7 +49,7 @@ public class PushEnterprise extends CommonEntity {
     @ApiModelProperty("法定代表人身份证")
     private String idCard;
 
-    @ApiModelProperty("审核状态: -1-驳回 0-待审核 1-审核通过")
+    @ApiModelProperty("审核状态")
     private Integer status;
 
     @ApiModelProperty("详细地址")
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
index e768d207..bb72bfae 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml
@@ -103,6 +103,7 @@
     </where>
   </select>
 
+  <!-- todo: 多条 common_push_concern_fan 相同跟 sys_user 关联可能会出现问题 -->
   <select id="selectPushFriendList" resultType="Map">
     SELECT
     cf.`status` cf_status,
@@ -120,7 +121,10 @@
     <where>
       u.del_flag = 0
       AND u.status = 0
-      AND u.user_type not in(2,5)
+      AND u.user_type not in(
+        ${@com.cloud.kicc.system.api.enums.UserTypeEnum@ENTERPRISE_USER.value},
+        ${@com.cloud.kicc.system.api.enums.UserTypeEnum@INTERNAL_USER.value}
+      )
       AND u.id != ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}
       <if test="map.nickName != null and map.nickName != ''">
         AND u.nick_name = #{map.nickName}
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
index 4dc6985d..81c7ba48 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java
@@ -46,7 +46,7 @@ public class TenantController {
     }
 
     @GetMapping("/list")
-    @PreAuthorize("@pms.hasPermission('tenant_view')")
+    //@PreAuthorize("@pms.hasPermission('tenant_view')")
     public R list(Page page, Tenant tenant) {
         IPage<Tenant> tenantPage = tenantService.page(page, getQueryWrapper(tenant));
         return R.ok(tenantPage.getRecords(), tenantPage.getTotal());
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
index 4a99a339..0b2a3f2f 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
@@ -139,10 +139,10 @@ public class UserController {
         user.setPassword(ENCODER.encode(user.getPassword()));
         userService.saveUser(user);
         // 企业内部用户推送类型数据同步
-        if (StrUtil.equals(user.getUserType(), "5")) {
+        if (StrUtil.equals(user.getUserType(), UserTypeEnum.INTERNAL_USER.getValue())) {
             List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
                     .ne(User::getId, SecurityUtils.getUser().getId())
-                    .notIn(User::getUserType, "2", "5"));
+                    .notIn(User::getUserType, UserTypeEnum.ENTERPRISE_USER.getValue(), UserTypeEnum.INTERNAL_USER.getValue()));
             remotePushConcernFanService.enterpriseUserFanSave(user.getId(), userList);
         }
         return R.ok();