提交 325c983e 作者: 洪东保

积分查询debug

父级 3f1dc15e
...@@ -87,22 +87,33 @@ public class AgentAuthController { ...@@ -87,22 +87,33 @@ public class AgentAuthController {
deptIdList = list.stream().filter(e -> e.getType() == 0).map(CoreModulePermissions::getRelId).collect(Collectors.toSet()); deptIdList = list.stream().filter(e -> e.getType() == 0).map(CoreModulePermissions::getRelId).collect(Collectors.toSet());
userIdList = list.stream().filter(e -> e.getType() == 1).map(CoreModulePermissions::getRelId).collect(Collectors.toSet()); userIdList = list.stream().filter(e -> e.getType() == 1).map(CoreModulePermissions::getRelId).collect(Collectors.toSet());
} }
List<SysUserSyncCategory> categories = new ArrayList<>(); List<SysUserSyncCategory> categories;
List<SysUserSync> userSyncs = new ArrayList<>(); List<SysUserSync> userSyncs = new ArrayList<>();
if (vo.getCategoryId().equals(CategoryConstant.ROOT)) { if (StrUtil.isNotBlank(vo.getSearch())) {
categories = iSysUserSyncCategoryService.selectParentIdNoInId(vo.getSearch());
} else {
categories = iSysUserSyncCategoryService.list(new LambdaQueryWrapper<SysUserSyncCategory>() categories = iSysUserSyncCategoryService.list(new LambdaQueryWrapper<SysUserSyncCategory>()
.eq(SysUserSyncCategory::getParentId, vo.getCategoryId())
.like(StrUtil.isNotBlank(vo.getSearch()), SysUserSyncCategory::getName, vo.getSearch()) .like(StrUtil.isNotBlank(vo.getSearch()), SysUserSyncCategory::getName, vo.getSearch())
.select(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getName) .select(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getName)
); );
userSyncs = sysUserSyncService.list(new LambdaQueryWrapper<SysUserSync>() userSyncs = sysUserSyncService.list(new LambdaQueryWrapper<SysUserSync>()
.eq(SysUserSync::getDeptId, vo.getCategoryId())
.like(StrUtil.isNotBlank(vo.getSearch()), SysUserSync::getName, vo.getSearch()) .like(StrUtil.isNotBlank(vo.getSearch()), SysUserSync::getName, vo.getSearch())
.select(SysUserSync::getUserId, SysUserSync::getName) .select(SysUserSync::getUserId, SysUserSync::getName)
); );
} else {
if (vo.getCategoryId().equals(CategoryConstant.ROOT)) {
categories = iSysUserSyncCategoryService.selectParentIdNoInId(vo.getSearch());
} else {
categories = iSysUserSyncCategoryService.list(new LambdaQueryWrapper<SysUserSyncCategory>()
.eq(SysUserSyncCategory::getParentId, vo.getCategoryId())
.like(StrUtil.isNotBlank(vo.getSearch()), SysUserSyncCategory::getName, vo.getSearch())
.select(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getName)
);
userSyncs = sysUserSyncService.list(new LambdaQueryWrapper<SysUserSync>()
.eq(SysUserSync::getDeptId, vo.getCategoryId())
.like(StrUtil.isNotBlank(vo.getSearch()), SysUserSync::getName, vo.getSearch())
.select(SysUserSync::getUserId, SysUserSync::getName)
);
}
} }
List<JSONObject> cateObjects = new ArrayList<>(); List<JSONObject> cateObjects = new ArrayList<>();
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</select> </select>
<delete id="deleteDataAfterThan3Months"> <delete id="deleteDataAfterThan3Months">
delete from cmt_meeting_info where start_time < DATE_SUB(#{date}, INTERVAL 3 MONTH); delete from cmt_meeting_info where start_time &lt; DATE_SUB(#{date}, INTERVAL 3 MONTH);
</delete> </delete>
</mapper> </mapper>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论