|
@@ -1,5 +1,6 @@
|
|
|
package com.cyksj.web.controller.manage.corp;
|
|
package com.cyksj.web.controller.manage.corp;
|
|
|
|
|
|
|
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -58,6 +59,7 @@ public class CorpMsgAuditController {
|
|
|
*/
|
|
*/
|
|
|
@GetMapping
|
|
@GetMapping
|
|
|
public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, @RequestParam(value = "tagIds", required = false) List<String> tagIds, Integer intention, Long talkStartTime, Long talkEndTime) throws Exception {
|
|
public Result<SearchResult<CorpMsgAuditUserView>> get(String textKey, @RequestParam(value = "tagIds", required = false) List<String> tagIds, Integer intention, Long talkStartTime, Long talkEndTime) throws Exception {
|
|
|
|
|
+ long adminId = StpUtil.getLoginIdAsLong();
|
|
|
Set<String> userIds = new HashSet<>();
|
|
Set<String> userIds = new HashSet<>();
|
|
|
if(StringUtils.isNotBlank(textKey)){
|
|
if(StringUtils.isNotBlank(textKey)){
|
|
|
List<QyMsgContent> text = corpQyMsgContentService.list(Wrappers.lambdaQuery(QyMsgContent.class).select(QyMsgContent::getFrom, QyMsgContent::getExternalUserid,QyMsgContent::getTolist).like(QyMsgContent::getText, textKey).eq(QyMsgContent::getRoomid,"").eq(QyMsgContent::getMsgtype, "text"));
|
|
List<QyMsgContent> text = corpQyMsgContentService.list(Wrappers.lambdaQuery(QyMsgContent.class).select(QyMsgContent::getFrom, QyMsgContent::getExternalUserid,QyMsgContent::getTolist).like(QyMsgContent::getText, textKey).eq(QyMsgContent::getRoomid,"").eq(QyMsgContent::getMsgtype, "text"));
|
|
@@ -77,6 +79,11 @@ public class CorpMsgAuditController {
|
|
|
builder.put("tag", String.format( "and cr.id = t.relation_id and t.tag_id %s", tagStr));
|
|
builder.put("tag", String.format( "and cr.id = t.relation_id and t.tag_id %s", tagStr));
|
|
|
builder.put("tagTable", ",corp_user_tag t");
|
|
builder.put("tagTable", ",corp_user_tag t");
|
|
|
}
|
|
}
|
|
|
|
|
+ //管理员
|
|
|
|
|
+ if (adminId == 78l) {
|
|
|
|
|
+ builder.put("tagTable", ",corp_user_tag t");
|
|
|
|
|
+ builder.put("tag", String.format("and cr.id = t.relation_id and t.tag_id = 'etvj2DPQAAxqh9QlGJG4N1EbdQBNYGAA'"));
|
|
|
|
|
+ }
|
|
|
if (intention != null) {
|
|
if (intention != null) {
|
|
|
builder.put("intention", String.format("and exists (select 1 from corp_user_pay_intention cup where cup.union_id = c.unionid and intention = %s limit 1)", intention));
|
|
builder.put("intention", String.format("and exists (select 1 from corp_user_pay_intention cup where cup.union_id = c.unionid and intention = %s limit 1)", intention));
|
|
|
}
|
|
}
|