wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-2106' into 'master'

Browse Source 
Feature/req 2106

See merge request universal/infrastructure/backend/nanopart!35
This commit is contained in:
金海洋 2024-05-08 08:22:32 +00:00
commit bf1d8b897e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
banner/banner-api/src/main/java/cn/axzo/nanopart/api/enums/MaterialTargetUserTypeEnum.java
View File

@ -41,7 +41,7 @@ public enum MaterialTargetUserTypeEnum {
Map<Long, List<String>> workspaceJobMap = workspaceOuJob.getWorkspaceJobMap(); Map<Long, List<String>> workspaceJobMap = workspaceOuJob.getWorkspaceJobMap();
log.info("投放项目部：{}，投放岗位岗位：{}，当前登录单位：{}，用户加入项目部及担任岗位：{}，单位加入的项目部：{}，项目部下的单位：{}", log.info("投放项目部：{}，投放岗位岗位：{}，当前登录单位：{}，用户加入项目部及担任岗位：{}，单位加入的项目部：{}，项目部下的单位：{}",
JSONUtil.toJsonStr(ouIds), JSONUtil.toJsonStr(jobCodes), JSONUtil.toJsonStr(workspaceIds), JSONUtil.toJsonStr(jobCodes),
loginOuid, loginOuid,
JSONUtil.toJsonStr(workspaceJobMap), JSONUtil.toJsonStr(workspaceJobMap),
JSONUtil.toJsonStr(workspaceOuJob.getOuWorkspaceMap()), JSONUtil.toJsonStr(workspaceOuJob.getOuWorkspaceMap()),

2
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/MaterialServiceImpl.java
View File

@ -323,7 +323,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialDao, Material> impl
String key = buildMaterialDisplayFrequencyKey(m, req.getPersonId()); String key = buildMaterialDisplayFrequencyKey(m, req.getPersonId());
if (RedisClient.KeyOps.hasKey(key)) { if (RedisClient.KeyOps.hasKey(key)) {
int frequency = Integer.parseInt(RedisClient.StringOps.get(key)); int frequency = Integer.parseInt(RedisClient.StringOps.get(key));
log.info("{素材投放key：{}，value：{}", key, frequency); log.info("素材投放key：{}，value：{}", key, frequency);
displayFrequencyFilter = MaterialDisplayFrequencyTypeEnum.NO_LIMIT.getCode().equals(m.getDisplayFrequencyType().getCode()) || frequency < m.getMaxDisplayFrequency(); displayFrequencyFilter = MaterialDisplayFrequencyTypeEnum.NO_LIMIT.getCode().equals(m.getDisplayFrequencyType().getCode()) || frequency < m.getMaxDisplayFrequency();
if (displayFrequencyFilter) { if (displayFrequencyFilter) {
// 本次需要投放 // 本次需要投放