Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
2e32a371
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2e32a371
编写于
9月 10, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
distinct问题修复
上级
4675b1cd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/AttachmentFactory.java
...om/x/file/assemble/control/factory/AttachmentFactory.java
+5
-4
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/FileFactory.java
...java/com/x/file/assemble/control/factory/FileFactory.java
+3
-2
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/file/ActionListReferenceType.java
.../assemble/control/jaxrs/file/ActionListReferenceType.java
+5
-2
未找到文件。
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/AttachmentFactory.java
浏览文件 @
2e32a371
package
com.x.file.assemble.control.factory
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.persistence.EntityManager
;
import
javax.persistence.criteria.CriteriaBuilder
;
...
...
@@ -46,8 +47,8 @@ public class AttachmentFactory extends AbstractFactory {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Attachment
>
root
=
cq
.
from
(
Attachment
.
class
);
Predicate
p
=
cb
.
isMember
(
person
,
root
.
get
(
Attachment_
.
shareList
));
cq
.
distinct
(
true
).
select
(
root
.
get
(
Attachment_
.
person
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
();
cq
.
select
(
root
.
get
(
Attachment_
.
person
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
()
.
stream
().
distinct
().
collect
(
Collectors
.
toList
())
;
}
public
List
<
String
>
listPersonWithEditor
(
String
person
)
throws
Exception
{
...
...
@@ -56,8 +57,8 @@ public class AttachmentFactory extends AbstractFactory {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Attachment
>
root
=
cq
.
from
(
Attachment
.
class
);
Predicate
p
=
cb
.
isMember
(
person
,
root
.
get
(
Attachment_
.
editorList
));
cq
.
distinct
(
true
).
select
(
root
.
get
(
Attachment_
.
person
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
();
cq
.
select
(
root
.
get
(
Attachment_
.
person
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
()
.
stream
().
distinct
().
collect
(
Collectors
.
toList
())
;
}
public
Long
countWithPersonWithShare
(
String
owner
,
String
person
)
throws
Exception
{
...
...
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/factory/FileFactory.java
浏览文件 @
2e32a371
package
com.x.file.assemble.control.factory
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.persistence.EntityManager
;
import
javax.persistence.criteria.CriteriaBuilder
;
...
...
@@ -28,7 +29,7 @@ public class FileFactory extends AbstractFactory {
Root
<
File
>
root
=
cq
.
from
(
File
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
File_
.
reference
),
reference
);
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
File_
.
referenceType
),
referenceType
));
cq
.
select
(
root
.
get
(
File_
.
id
)).
where
(
p
)
.
distinct
(
true
)
;
return
em
.
createQuery
(
cq
).
getResultList
();
cq
.
select
(
root
.
get
(
File_
.
id
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
()
.
stream
().
distinct
().
collect
(
Collectors
.
toList
())
;
}
}
\ No newline at end of file
o2server/x_file_assemble_control/src/main/java/com/x/file/assemble/control/jaxrs/file/ActionListReferenceType.java
浏览文件 @
2e32a371
...
...
@@ -2,6 +2,7 @@ package com.x.file.assemble.control.jaxrs.file;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.persistence.EntityManager
;
import
javax.persistence.criteria.CriteriaBuilder
;
...
...
@@ -9,10 +10,12 @@ import javax.persistence.criteria.CriteriaQuery;
import
javax.persistence.criteria.Predicate
;
import
javax.persistence.criteria.Root
;
import
com.google.gson.GsonBuilder
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.file.assemble.control.Business
;
...
...
@@ -45,8 +48,8 @@ class ActionListReferenceType extends BaseAction {
CriteriaQuery
<
ReferenceType
>
cq
=
cb
.
createQuery
(
ReferenceType
.
class
);
Root
<
File
>
root
=
cq
.
from
(
File
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
File_
.
person
),
effectivePerson
.
getDistinguishedName
());
cq
.
select
(
root
.
get
(
File_
.
referenceType
)).
where
(
p
)
.
distinct
(
true
)
;
return
em
.
createQuery
(
cq
).
getResultList
();
cq
.
select
(
root
.
get
(
File_
.
referenceType
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
()
.
stream
().
distinct
().
collect
(
Collectors
.
toList
())
;
}
private
Long
countWithPersonWithReferenceType
(
Business
business
,
EffectivePerson
effectivePerson
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录