Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
ca9072dd
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,发现更多精彩内容 >>
提交
ca9072dd
编写于
10月 28, 2021
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wrdp' into 'develop'
Wrdp See merge request o2oa/o2oa!5857
上级
1f5258bc
57ea9e89
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
14 deletion
+17
-14
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
...x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
+15
-14
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java
...com/x/query/assemble/designer/jaxrs/table/ActionEdit.java
+2
-0
未找到文件。
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
浏览文件 @
ca9072dd
...
...
@@ -77,13 +77,13 @@ public class ActionSave extends BaseAction {
topUnitName
=
"xadmin"
;
}
}
if
(
check
)
{
if
(
StringUtils
.
isEmpty
(
identityName
)
)
{
identityName
=
wi
.
getCreatorIdentity
();
}
}
if
(
check
)
{
if
(
StringUtils
.
isEmpty
(
wi
.
getAppId
()
)
)
{
check
=
false
;
...
...
@@ -91,7 +91,7 @@ public class ActionSave extends BaseAction {
result
.
error
(
exception
);
}
}
if
(
check
&&
!
"xadmin"
.
equals
(
identityName
)
)
{
try
{
unitName
=
userManagerService
.
getUnitNameByIdentity
(
identityName
);
...
...
@@ -102,7 +102,7 @@ public class ActionSave extends BaseAction {
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
}
}
if
(
check
&&
!
"xadmin"
.
equals
(
identityName
))
{
try
{
topUnitName
=
userManagerService
.
getTopUnitNameByIdentity
(
identityName
);
...
...
@@ -142,13 +142,13 @@ public class ActionSave extends BaseAction {
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
}
}
if
(
check
)
{
wi
.
setCreatorIdentity
(
identityName
);
wi
.
setCreatorPerson
(
effectivePerson
.
getDistinguishedName
()
);
wi
.
setCreatorUnitName
(
unitName
);
wi
.
setCreatorTopUnitName
(
topUnitName
);
if
(
StringUtils
.
equals
(
"信息"
,
wi
.
getDocumentType
()
)
)
{
if
(
wi
.
getSendNotify
()
==
null
)
{
if
(
appInfo
.
getSendNotify
()
==
null
)
{
...
...
@@ -166,24 +166,25 @@ public class ActionSave extends BaseAction {
}
try
{
CacheManager
.
notify
(
CategoryInfo
.
class
);
categoryInfo
=
categoryInfoServiceAdv
.
save
(
wi
,
wi
.
getExtContent
(),
effectivePerson
);
Wo
wo
=
new
Wo
();
wo
.
setId
(
categoryInfo
.
getId
());
result
.
setData
(
wo
);
if
(
old_categoryInfo
!=
null
)
{
if
(
!
old_categoryInfo
.
getCategoryName
().
equalsIgnoreCase
(
categoryInfo
.
getCategoryName
()
)
||
if
(
!
old_categoryInfo
.
getCategoryName
().
equalsIgnoreCase
(
categoryInfo
.
getCategoryName
()
)
||
!
old_categoryInfo
.
getCategoryAlias
().
equalsIgnoreCase
(
categoryInfo
.
getCategoryAlias
()
)
)
{
//修改了分类名称,增加删除栏目批量操作(对分类和文档)的信息
new
CmsBatchOperationPersistService
().
addOperation
(
CmsBatchOperationProcessService
.
OPT_OBJ_CATEGORY
,
new
CmsBatchOperationPersistService
().
addOperation
(
CmsBatchOperationProcessService
.
OPT_OBJ_CATEGORY
,
CmsBatchOperationProcessService
.
OPT_TYPE_UPDATENAME
,
categoryInfo
.
getId
(),
old_categoryInfo
.
getCategoryName
(),
"更新分类名称:ID="
+
categoryInfo
.
getId
()
);
}
if
(
permissionQueryService
.
hasDiffrentViewPermissionInCategory
(
old_categoryInfo
,
categoryInfo
))
{
//修改了栏目名称或者别名,增加删除栏目批量操作(对分类和文档)的信息
new
CmsBatchOperationPersistService
().
addOperation
(
CmsBatchOperationProcessService
.
OPT_OBJ_CATEGORY
,
new
CmsBatchOperationPersistService
().
addOperation
(
CmsBatchOperationProcessService
.
OPT_OBJ_CATEGORY
,
CmsBatchOperationProcessService
.
OPT_TYPE_PERMISSION
,
categoryInfo
.
getId
(),
categoryInfo
.
getCategoryName
(),
"变更分类可见权限:ID="
+
categoryInfo
.
getId
()
);
}
new
LogService
().
log
(
null
,
effectivePerson
.
getDistinguishedName
(),
categoryInfo
.
getAppName
()
+
"-"
+
categoryInfo
.
getCategoryName
(),
categoryInfo
.
getId
(),
""
,
""
,
""
,
"CATEGORY"
,
"更新"
);
...
...
@@ -216,7 +217,7 @@ public class ActionSave extends BaseAction {
@FieldDescribe
(
"用户保存的身份"
)
private
String
identity
=
null
;
@FieldDescribe
(
"扩展信息JSON内容"
)
private
String
extContent
=
null
;
...
...
@@ -241,4 +242,4 @@ public class ActionSave extends BaseAction {
public
static
class
Wo
extends
WoId
{
}
}
\ No newline at end of file
}
o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/table/ActionEdit.java
浏览文件 @
ca9072dd
...
...
@@ -62,6 +62,8 @@ class ActionEdit extends BaseAction {
table
.
setData
(
table
.
getDraftData
());
}
else
{
table
.
setData
(
""
);
table
.
setAlias
(
wi
.
getAlias
());
table
.
setName
(
wi
.
getName
());
}
emc
.
check
(
table
,
CheckPersistType
.
all
);
emc
.
commit
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录