|
|
|
|
@ -107,6 +107,9 @@ public class ClueJpa {
|
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
|
sql.append("and cm.member_id = :memberId ");
|
|
|
|
|
}
|
|
|
|
|
if (clueQueryCriteria.getUserIdList() != null) {
|
|
|
|
|
sql.append("and cm.member_id in :userIdList ");
|
|
|
|
|
}
|
|
|
|
|
if (clueQueryCriteria.getOrganizeId() != null) {
|
|
|
|
|
sql.append("and cm.organize_id = :organizeId ");
|
|
|
|
|
}
|
|
|
|
|
@ -149,6 +152,10 @@ public class ClueJpa {
|
|
|
|
|
if (clueQueryCriteria.getMemberId() != null) {
|
|
|
|
|
query.setParameter("memberId", clueQueryCriteria.getMemberId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(clueQueryCriteria.getUserIdList())) {
|
|
|
|
|
query.setParameter("userIdList", clueQueryCriteria.getUserIdList());
|
|
|
|
|
}
|
|
|
|
|
if (clueQueryCriteria.getOrganizeId() != null) {
|
|
|
|
|
query.setParameter("organizeId", clueQueryCriteria.getOrganizeId());
|
|
|
|
|
}
|
|
|
|
|
@ -177,7 +184,7 @@ public class ClueJpa {
|
|
|
|
|
if (clueType != null) {
|
|
|
|
|
query.setParameter("clueType", clueType);
|
|
|
|
|
} else {
|
|
|
|
|
query.setParameter("clueTypes",clueQueryCriteria.getClueTypes());
|
|
|
|
|
query.setParameter("clueTypes", clueQueryCriteria.getClueTypes());
|
|
|
|
|
}
|
|
|
|
|
query.unwrap(NativeQueryImpl.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
|
|
|
|
|
return query.getResultList();
|
|
|
|
|
@ -208,11 +215,11 @@ public class ClueJpa {
|
|
|
|
|
String key = "task:encryption:" + taskId;
|
|
|
|
|
String str = String.valueOf(redisUtils.get(key));
|
|
|
|
|
// 查看资源是否需要加密显示
|
|
|
|
|
if (isEncryption != null && isEncryption == 1){
|
|
|
|
|
if (isEncryption != null && isEncryption == 1) {
|
|
|
|
|
StringBuilder stringBuilder = new StringBuilder(nid);
|
|
|
|
|
String strRep = stringBuilder.replace(3, 7, "****").toString();
|
|
|
|
|
clueDto.setNid(strRep);
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
// 查看任务是否需要加密显示资源
|
|
|
|
|
if ("null".equals(str) || StringUtils.isBlank(str)) {
|
|
|
|
|
ClueDto clueDtoClient = new ClueDto();
|
|
|
|
|
@ -348,7 +355,7 @@ public class ClueJpa {
|
|
|
|
|
} else {
|
|
|
|
|
sql.append("AND tcm.clue_type in :clueTypes ");
|
|
|
|
|
}
|
|
|
|
|
if(clueCallStatus !=null){
|
|
|
|
|
if (clueCallStatus != null) {
|
|
|
|
|
sql.append("AND tcm.clue_call_status = :clueCallStatus ");
|
|
|
|
|
}
|
|
|
|
|
//拼接最后加入时间排序,没加id排序出现数据重复问题(注意空格)
|
|
|
|
|
@ -381,9 +388,9 @@ public class ClueJpa {
|
|
|
|
|
if (clueType != null) {
|
|
|
|
|
query.setParameter("clueType", clueType);
|
|
|
|
|
} else {
|
|
|
|
|
query.setParameter("clueTypes",clueQueryCriteria.getClueTypes());
|
|
|
|
|
query.setParameter("clueTypes", clueQueryCriteria.getClueTypes());
|
|
|
|
|
}
|
|
|
|
|
if(clueCallStatus!=null){
|
|
|
|
|
if (clueCallStatus != null) {
|
|
|
|
|
query.setParameter("clueCallStatus", clueCallStatus);
|
|
|
|
|
}
|
|
|
|
|
query.setParameter("number", pageable.getPageNumber() * pageable.getPageSize());
|
|
|
|
|
@ -404,11 +411,11 @@ public class ClueJpa {
|
|
|
|
|
clue.setCreateTime((Date) row.get("createTime"));
|
|
|
|
|
clue.setName((String) row.get("name"));
|
|
|
|
|
String nid = AESUtils.decrypt(phone, secret);
|
|
|
|
|
if (isEncryption == 1){
|
|
|
|
|
if (isEncryption == 1) {
|
|
|
|
|
StringBuilder stringBuilder = new StringBuilder(nid);
|
|
|
|
|
String strRep = stringBuilder.replace(3, 7, "****").toString();
|
|
|
|
|
clue.setNid(strRep);
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
clue.setNid(nid);
|
|
|
|
|
}
|
|
|
|
|
BigInteger taskId = (BigInteger) row.get("taskId");
|
|
|
|
|
|
