diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java
new file mode 100644
index 000000000..0d5c8a7fb
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SuperAdminConfigDAO.java
@@ -0,0 +1,36 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.SuperAdminConfigDO;
+import com.cool.store.mapper.SuperAdminConfigMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/11/9 14:26
+ * @Version 1.0
+ */
+@Repository
+public class SuperAdminConfigDAO {
+
+ @Resource
+ SuperAdminConfigMapper superAdminConfigMapper;
+
+ public SuperAdminConfigDO selectByPrimaryKey(Long id){
+ if (id==null){
+ return null;
+ }
+ return superAdminConfigMapper.selectByPrimaryKey(id);
+ }
+
+
+ public SuperAdminConfigDO isSuperAdmin(String userId){
+ return superAdminConfigMapper.isSuperAdmin(userId);
+ }
+
+
+
+
+}
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java
new file mode 100644
index 000000000..e8449f4ba
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SuperAdminConfigMapper.java
@@ -0,0 +1,18 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.SuperAdminConfigDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author zhangchenbiao
+ * @date 2023-11-09 02:24
+ */
+public interface SuperAdminConfigMapper {
+
+ SuperAdminConfigDO selectByPrimaryKey(Long id);
+
+ SuperAdminConfigDO isSuperAdmin(@Param("userId") String userId);
+}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 3799fba51..7bff72bd3 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -598,11 +598,6 @@
AND hpuinfo.recommend_partner_mobile like concat('%',#{storeKeyword},'%')
-
-
- #{userId}
-
-
bi.user_portrait like concat("%,", #{userPortraitId}, ",%")
@@ -630,6 +625,11 @@
AND hpuinfo.user_channel_id is null
+
+
+ #{userId}
+
+
#{developmentManager}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml
new file mode 100644
index 000000000..27030549c
--- /dev/null
+++ b/coolstore-partner-dao/src/main/resources/mapper/SuperAdminConfigMapper.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, super_admin_user_id, deleted, create_time, update_time, create_user_id, update_user_id
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/test/resources/mybatis-generator.xml b/coolstore-partner-dao/src/test/resources/mybatis-generator.xml
index 880e6e523..9c65c42b8 100644
--- a/coolstore-partner-dao/src/test/resources/mybatis-generator.xml
+++ b/coolstore-partner-dao/src/test/resources/mybatis-generator.xml
@@ -29,7 +29,7 @@
-
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java
new file mode 100644
index 000000000..aed084113
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java
@@ -0,0 +1,43 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * @author zhangchenbiao
+ * @date 2023-11-09 02:24
+ */
+@Table(name = "super_admin_config")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SuperAdminConfigDO implements Serializable {
+ @ApiModelProperty("")
+ private Long id;
+
+ @ApiModelProperty("超管用户ID")
+ private String superAdminUserId;
+
+ @ApiModelProperty("删除标志 0-正常 1-删除")
+ private Integer deleted;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty("新建人ID")
+ private String createUserId;
+
+ @ApiModelProperty("更新人ID")
+ private String updateUserId;
+}
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java
index 8d5d0addf..42f600de8 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EnterpriseUserService.java
@@ -33,6 +33,7 @@ public interface EnterpriseUserService {
+
List getDevelopmentDirectorList(String wantShopArea);
/**
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index fc2781e21..b1b6459e5 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -98,6 +98,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
HyFollowTaskDAO hyFollowTaskDAO;
@Resource
private HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO;
+ @Resource
+ SuperAdminConfigDAO superAdminConfigDAO;
@Autowired
private WechatMiniAppService wechatMiniAppService;
@@ -632,9 +634,18 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
@Override
public PageInfo privateSeaLineList(String userId, PrivateSeaLineListRequest request,Boolean allPrivateSeaFlag) {
//allPrivateSeaFlag 为true的时候 查询全量私海
+ // V1.5.2 修改allPrivateSeaFlag 为False 查询我的线索 为true时根据是否是超管或者主管查询数据
UserPositionAndUserScopeDTO userIdsByScope = new UserPositionAndUserScopeDTO();
- if (!allPrivateSeaFlag){
- userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
+ //如果是查询团队线索 判断是否是超管 不是超管 判断是是否是主管
+ if (allPrivateSeaFlag){
+ //如果不是超管 查询个人数据或者主管数据 如果是超管 查询所有数据
+ if (!isSuperAdmin(userId)){
+ userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
+ }
+ }else {
+ //如果是查询我的线索 只需要查询招商经理或者开发经理是我的线索
+ userIdsByScope.setDevelopmentUserIds(Arrays.asList(userId));
+ userIdsByScope.setInvestmentUserIds(Arrays.asList(userId));
}
String intentAreaName = getIntentAreaName(request.getIntentAreaId());
PageHelper.startPage(request.getPageNum(),request.getPageSize());
@@ -671,6 +682,15 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
return privateLineList;
}
+ private Boolean isSuperAdmin(String userId){
+ SuperAdminConfigDO superAdmin = superAdminConfigDAO.isSuperAdmin(userId);
+ if (superAdmin!=null){
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+
+
@Override
public PartnerLineBaseInfoVO getPartnerLinBaseInfo(String partnerId) {
PartnerLineBaseInfoVO lineBaseInfoVO = new PartnerLineBaseInfoVO();