diff --git a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamodule.html b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamodule.html
index 2f6a169..6d6613d 100644
--- a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamodule.html
+++ b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamodule.html
@@ -118,7 +118,7 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
- var img = '
';
+ var img = '
';
if(initImageTimeout) {
clearTimeout(initImageTimeout);
}
diff --git a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect.html b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect.html
index 899f946..57ccbe9 100644
--- a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect.html
+++ b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect.html
@@ -104,7 +104,7 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
- var img = '
';
+ var img = '
';
if(initImageTimeout) {
clearTimeout(initImageTimeout);
}
diff --git a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect2.html b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect2.html
index 32785d0..c7b94e8 100644
--- a/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect2.html
+++ b/module-bigdata/src/main/resources/templates/bigdatamodule/list-bigdatamoduleselect2.html
@@ -65,7 +65,7 @@
选项联动
{{# } }}
{{d[i].bigdataModuleName}}
-
+
{{d[i].bigdataModuleCode}} - {{d[i].bigdataModuleTypeDictionaryName}}
diff --git a/module-building-pictures/src/main/resources/templates/picturestemplate/list-picturestemplate.html b/module-building-pictures/src/main/resources/templates/picturestemplate/list-picturestemplate.html
index ad27c68..4e3aecb 100644
--- a/module-building-pictures/src/main/resources/templates/picturestemplate/list-picturestemplate.html
+++ b/module-building-pictures/src/main/resources/templates/picturestemplate/list-picturestemplate.html
@@ -98,9 +98,9 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
- var value = '
';
+ var value = '
';
if(picturesTemplatePictureUrl) {
- value = '
';
+ value = '
';
}
setTimeout(function() {
new Viewer(document.getElementById("viewer"),{
diff --git a/module-config-column/src/main/java/cn/com/tenlion/configcolumn/service/configcolumngroup/impl/ConfigColumnGroupServiceImpl.java b/module-config-column/src/main/java/cn/com/tenlion/configcolumn/service/configcolumngroup/impl/ConfigColumnGroupServiceImpl.java
index 55b960b..1279e5e 100644
--- a/module-config-column/src/main/java/cn/com/tenlion/configcolumn/service/configcolumngroup/impl/ConfigColumnGroupServiceImpl.java
+++ b/module-config-column/src/main/java/cn/com/tenlion/configcolumn/service/configcolumngroup/impl/ConfigColumnGroupServiceImpl.java
@@ -220,6 +220,7 @@ public class ConfigColumnGroupServiceImpl extends DefaultBaseService implements
@Override
public List listToApp(String token, Map params) {
+ String configColumnRole = params.get("configColumnRole") == null ? "0" : params.get("configColumnRole").toString();
// 只加载显示状态为true的栏目组
params.put("configColumnGroupStatus", "1");
List configColumnGroupDTOs = list(params);
@@ -229,7 +230,7 @@ public class ConfigColumnGroupServiceImpl extends DefaultBaseService implements
List configColumnList = new ArrayList();
// 只加载显示的栏目
for(ConfigColumnDTO dto : list) {
- if ("1".equals(dto.getConfigColumnStatus())) {
+ if ("1".equals(dto.getConfigColumnStatus()) && dto.getConfigColumnRole().contains(configColumnRole)) {
ConfigColumnSetDTO setDisplayDTO = iConfigColumnSetService.getSetDisplay(token, dto.getConfigColumnId());
ConfigColumnSetDTO setNameDTO = iConfigColumnSetService.getSetName(token, dto.getConfigColumnId());
// 封装自定义名称
diff --git a/module-config-column/src/main/resources/mybatis/mapper/configcolumn/config-column-mapper.xml b/module-config-column/src/main/resources/mybatis/mapper/configcolumn/config-column-mapper.xml
index 18793fc..7ed943a 100644
--- a/module-config-column/src/main/resources/mybatis/mapper/configcolumn/config-column-mapper.xml
+++ b/module-config-column/src/main/resources/mybatis/mapper/configcolumn/config-column-mapper.xml
@@ -25,6 +25,8 @@
+
+
@@ -107,7 +109,9 @@
t1.config_column_comment,
t1.config_column_dispatch,
t1.config_column_like,
- t1.config_column_collect
+ t1.config_column_collect,
+ t1.config_column_role,
+ t1.config_column_help
FROM
m_config_column t1
WHERE
@@ -138,7 +142,9 @@
t1.config_column_comment,
t1.config_column_dispatch,
t1.config_column_like,
- t1.config_column_collect
+ t1.config_column_collect,
+ t1.config_column_role,
+ t1.config_column_help
FROM
m_config_column t1
WHERE
@@ -172,6 +178,8 @@
config_column_dispatch,
config_column_like,
config_column_collect,
+ config_column_role,
+ config_column_help,
creator,
gmt_create,
modifier,
@@ -200,6 +208,8 @@
#{configColumnDispatch},
#{configColumnLike},
#{configColumnCollect},
+ #{configColumnRole},
+ #{configColumnHelp},
#{creator},
#{gmtCreate},
#{modifier},
@@ -287,6 +297,10 @@
config_column_row_target_url = #{configColumnRowTargetUrl},
+
+ config_column_role = #{configColumnRole},
+
+ config_column_help = #{configColumnHelp},
config_column_comment = #{configColumnComment},
config_column_dispatch = #{configColumnDispatch},
config_column_like = #{configColumnLike},
@@ -322,7 +336,9 @@
t1.config_column_comment,
t1.config_column_dispatch,
t1.config_column_like,
- t1.config_column_collect
+ t1.config_column_collect,
+ t1.config_column_role,
+ t1.config_column_help
FROM
m_config_column t1
WHERE
@@ -442,7 +458,9 @@
t1.config_column_comment,
t1.config_column_dispatch,
t1.config_column_like,
- t1.config_column_collect
+ t1.config_column_collect,
+ t1.config_column_role,
+ t1.config_column_help
FROM
m_config_column t1
WHERE
diff --git a/module-config-column/src/main/resources/mybatis/mapper/configcolumngroup/config-column-group-mapper.xml b/module-config-column/src/main/resources/mybatis/mapper/configcolumngroup/config-column-group-mapper.xml
index 365557b..9319720 100644
--- a/module-config-column/src/main/resources/mybatis/mapper/configcolumngroup/config-column-group-mapper.xml
+++ b/module-config-column/src/main/resources/mybatis/mapper/configcolumngroup/config-column-group-mapper.xml
@@ -14,6 +14,7 @@
+
@@ -63,7 +64,8 @@
t1.config_column_group_order,
t1.config_column_group_target_mode,
t1.config_column_group_target_url,
- t1.config_column_group_style
+ t1.config_column_group_style,
+ t1.config_column_group_role
FROM
m_config_column_group t1
WHERE
@@ -84,6 +86,7 @@
config_column_group_target_mode,
config_column_group_target_url,
config_column_group_style,
+ config_column_group_role,
creator,
gmt_create,
modifier,
@@ -101,6 +104,7 @@
#{configColumnGroupTargetMode},
#{configColumnGroupTargetUrl},
#{configColumnGroupStyle},
+ #{configColumnGroupRole},
#{creator},
#{gmtCreate},
#{modifier},
@@ -167,6 +171,7 @@
config_column_group_style = #{configColumnGroupStyle},
+ config_column_group_role = #{configColumnGroupRole},
gmt_modified = #{gmtModified},
modifier = #{modifier},
config_column_group_id = config_column_group_id
@@ -187,7 +192,8 @@
t1.config_column_group_order,
t1.config_column_group_target_mode,
t1.config_column_group_target_url,
- t1.config_column_group_style
+ t1.config_column_group_style,
+ t1.config_column_group_role
FROM
m_config_column_group t1
WHERE
@@ -275,11 +281,14 @@
t1.modifier,
t1.gmt_modified,
t1.is_delete,
- 1
+ t1.config_column_group_role
FROM
m_config_column_group t1
WHERE
t1.is_delete = 0
+
+ AND t1.config_column_group_role LIKE CONCAT('%', CONCAT( #{configColumnGroupRole} , '%'))
+
AND t1.config_column_group_status = #{configColumnGroupStatus}
diff --git a/module-config-column/src/main/resources/templates/configcolumn/list.html b/module-config-column/src/main/resources/templates/configcolumn/list.html
index 2126c83..7deb384 100644
--- a/module-config-column/src/main/resources/templates/configcolumn/list.html
+++ b/module-config-column/src/main/resources/templates/configcolumn/list.html
@@ -33,6 +33,14 @@
+
+