|
@@ -2352,6 +2352,7 @@ func (this *UserController) CompanyTableDetail() {
|
|
|
br.Msg = "用户不存在"
|
|
|
return
|
|
|
}
|
|
|
+ fmt.Println("ClassType", classType)
|
|
|
// 1.标记用户表
|
|
|
//操作权限校验
|
|
|
resp := new(cygx.UserInteractionListResp)
|
|
@@ -2367,22 +2368,6 @@ func (this *UserController) CompanyTableDetail() {
|
|
|
condition += ` AND ( r.mobile LIKE '%` + keyWord + `%' OR r.email LIKE '%` + keyWord + `%' OR r.real_name LIKE '%` + keyWord + `%')`
|
|
|
}
|
|
|
|
|
|
- conditionArtcile := condition //文章搜索条件
|
|
|
- conditionActivityMeet := condition //活动到会搜索条件
|
|
|
- conditionIndustryFllow := condition //产业关注搜索条件
|
|
|
- conditionKeyWord := condition //关键词记录搜索条件
|
|
|
- if classType == 1 {
|
|
|
- conditionArtcile += " AND art.article_type_id = 0 "
|
|
|
- conditionActivityMeet += " AND a.chart_permission_id != 31 "
|
|
|
- conditionIndustryFllow += " AND m.chart_permission_id != 31 "
|
|
|
- conditionKeyWord += " AND r.register_platform IN (1,2) "
|
|
|
- } else {
|
|
|
- conditionArtcile += " AND art.article_type_id > 0 "
|
|
|
- conditionActivityMeet += " AND a.chart_permission_id = 31 "
|
|
|
- conditionIndustryFllow += " AND m.chart_permission_id = 31 "
|
|
|
- conditionKeyWord += " AND r.register_platform IN (5,6) "
|
|
|
- }
|
|
|
-
|
|
|
var isAdminRole bool
|
|
|
//如果不是管理员身份或者研究员身份则需要添加可见范围处理
|
|
|
if sysUser.Role == utils.ROLE_TYPE_CODE_ADMIN || sysUser.Role == utils.ROLE_TYPE_CODE_RESEARCHR {
|
|
@@ -2398,6 +2383,7 @@ func (this *UserController) CompanyTableDetail() {
|
|
|
endDate += " 23:59:59"
|
|
|
condition += ` AND r.create_time <= '` + endDate + `' `
|
|
|
}
|
|
|
+ condition += " AND r.source = 'article' "
|
|
|
if classType == 1 {
|
|
|
condition += " AND art.article_type_id = 0 "
|
|
|
} else {
|