Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
783ec75f
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
783ec75f
编写于
9月 11, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
distinct问题修复
上级
8c31dcad
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
17 addition
and
16 deletion
+17
-16
o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java
.../java/com/x/program/center/dingding/SyncOrganization.java
+3
-3
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java
...com/x/program/center/jaxrs/market/ActionListCategory.java
+3
-2
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/prompterrorlog/ActionCountWithExceptionClass.java
...r/jaxrs/prompterrorlog/ActionCountWithExceptionClass.java
+1
-1
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/prompterrorlog/ActionCountWithLoggerName.java
...enter/jaxrs/prompterrorlog/ActionCountWithLoggerName.java
+1
-1
o2server/x_program_center/src/main/java/com/x/program/center/qiyeweixin/SyncOrganization.java
...ava/com/x/program/center/qiyeweixin/SyncOrganization.java
+3
-3
o2server/x_program_center/src/main/java/com/x/program/center/welink/SyncOrganization.java
...in/java/com/x/program/center/welink/SyncOrganization.java
+3
-3
o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java
...om/x/program/center/zhengwudingding/SyncOrganization.java
+3
-3
未找到文件。
o2server/x_program_center/src/main/java/com/x/program/center/dingding/SyncOrganization.java
浏览文件 @
783ec75f
...
...
@@ -408,7 +408,7 @@ public class SyncOrganization {
Root
<
Identity
>
root
=
cq
.
from
(
Identity
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Identity_
.
person
),
person
.
getId
());
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Identity_
.
unit
),
unit
.
getId
()));
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
setMaxResults
(
1
).
getResultList
();
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
setMaxResults
(
1
).
getResultList
();
Identity
identity
=
null
;
Long
order
=
null
;
if
(
StringUtils
.
isNotEmpty
(
user
.
getOrderInDepts
()))
{
...
...
@@ -543,7 +543,7 @@ public class SyncOrganization {
Root
<
Unit
>
root
=
cq
.
from
(
Unit
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Unit_
.
dingdingId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Unit_
.
dingdingId
)));
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
@@ -555,7 +555,7 @@ public class SyncOrganization {
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Person_
.
dingdingId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Person_
.
dingdingId
)));
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java
浏览文件 @
783ec75f
...
...
@@ -13,6 +13,7 @@ import javax.persistence.criteria.CriteriaBuilder;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Root
;
import
java.util.List
;
import
java.util.stream.Collectors
;
class
ActionListCategory
extends
BaseAction
{
...
...
@@ -24,8 +25,8 @@ class ActionListCategory extends BaseAction {
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Application
>
root
=
cq
.
from
(
Application
.
class
);
cq
.
select
(
root
.
get
(
Application_
.
category
))
.
distinct
(
true
)
;
List
<
String
>
categoryList
=
em
.
createQuery
(
cq
).
getResultList
();
cq
.
select
(
root
.
get
(
Application_
.
category
));
List
<
String
>
categoryList
=
em
.
createQuery
(
cq
).
getResultList
()
.
stream
().
distinct
().
collect
(
Collectors
.
toList
())
;
Wo
wo
=
new
Wo
();
wo
.
setValueList
(
categoryList
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/prompterrorlog/ActionCountWithExceptionClass.java
浏览文件 @
783ec75f
...
...
@@ -47,7 +47,7 @@ class ActionCountWithExceptionClass extends BaseAction {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
PromptErrorLog
>
root
=
cq
.
from
(
PromptErrorLog
.
class
);
cq
.
select
(
root
.
get
(
PromptErrorLog_
.
exceptionClass
));
return
em
.
createQuery
(
cq
.
distinct
(
true
)).
getResultList
(
);
return
em
.
createQuery
(
cq
).
getResultList
().
stream
().
distinct
().
collect
(
Collectors
.
toList
()
);
}
private
Long
count
(
Business
business
,
String
exceptionClass
)
throws
Exception
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/prompterrorlog/ActionCountWithLoggerName.java
浏览文件 @
783ec75f
...
...
@@ -47,7 +47,7 @@ class ActionCountWithLoggerName extends BaseAction {
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
PromptErrorLog
>
root
=
cq
.
from
(
PromptErrorLog
.
class
);
cq
.
select
(
root
.
get
(
PromptErrorLog_
.
loggerName
));
return
em
.
createQuery
(
cq
.
distinct
(
true
)).
getResultList
(
);
return
em
.
createQuery
(
cq
).
getResultList
().
stream
().
distinct
().
collect
(
Collectors
.
toList
()
);
}
private
Long
count
(
Business
business
,
String
loggerName
)
throws
Exception
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/qiyeweixin/SyncOrganization.java
浏览文件 @
783ec75f
...
...
@@ -403,7 +403,7 @@ public class SyncOrganization {
Root
<
Identity
>
root
=
cq
.
from
(
Identity
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Identity_
.
person
),
person
.
getId
());
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Identity_
.
unit
),
unit
.
getId
()));
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
setMaxResults
(
1
).
getResultList
();
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
setMaxResults
(
1
).
getResultList
();
Identity
identity
=
null
;
Long
order
=
null
;
if
(
ListTools
.
isNotEmpty
(
user
.
getOrder
()))
{
...
...
@@ -533,7 +533,7 @@ public class SyncOrganization {
Root
<
Unit
>
root
=
cq
.
from
(
Unit
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Unit_
.
qiyeweixinId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Unit_
.
qiyeweixinId
)));
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
@@ -545,7 +545,7 @@ public class SyncOrganization {
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Person_
.
qiyeweixinId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Person_
.
qiyeweixinId
)));
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
o2server/x_program_center/src/main/java/com/x/program/center/welink/SyncOrganization.java
浏览文件 @
783ec75f
...
...
@@ -171,7 +171,7 @@ public class SyncOrganization {
Root
<
Identity
>
root
=
cq
.
from
(
Identity
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Identity_
.
person
),
person
.
getId
());
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Identity_
.
unit
),
unit
.
getId
()));
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
setMaxResults
(
1
).
getResultList
();
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
setMaxResults
(
1
).
getResultList
();
Identity
identity
=
null
;
Long
order
=
null
;
// if (StringUtils.isNotEmpty(user.getOrderInDepts())) {
...
...
@@ -450,7 +450,7 @@ public class SyncOrganization {
Root
<
Unit
>
root
=
cq
.
from
(
Unit
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Unit_
.
weLinkId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Unit_
.
weLinkId
)));
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
@@ -462,7 +462,7 @@ public class SyncOrganization {
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Person_
.
weLinkId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Person_
.
weLinkId
)));
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
o2server/x_program_center/src/main/java/com/x/program/center/zhengwudingding/SyncOrganization.java
浏览文件 @
783ec75f
...
...
@@ -384,7 +384,7 @@ public class SyncOrganization {
Root
<
Identity
>
root
=
cq
.
from
(
Identity
.
class
);
Predicate
p
=
cb
.
equal
(
root
.
get
(
Identity_
.
person
),
person
.
getId
());
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Identity_
.
unit
),
unit
.
getId
()));
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
setMaxResults
(
1
).
getResultList
();
List
<
Identity
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
setMaxResults
(
1
).
getResultList
();
Identity
identity
=
null
;
if
(
os
.
size
()
==
0
)
{
identity
=
this
.
createIdentity
(
business
,
result
,
person
,
unit
,
user
);
...
...
@@ -520,7 +520,7 @@ public class SyncOrganization {
Root
<
Unit
>
root
=
cq
.
from
(
Unit
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Unit_
.
zhengwuDingdingId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Unit_
.
zhengwuDingdingId
)));
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Unit
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
@@ -532,7 +532,7 @@ public class SyncOrganization {
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
notEqual
(
root
.
get
(
Person_
.
zhengwuDingdingId
),
""
);
p
=
cb
.
and
(
p
,
cb
.
isNotNull
(
root
.
get
(
Person_
.
zhengwuDingdingId
)));
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)
.
distinct
(
true
)
).
getResultList
();
List
<
Person
>
os
=
em
.
createQuery
(
cq
.
select
(
root
).
where
(
p
)).
getResultList
();
return
os
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录