diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java
index a1f1150..a24d3d1 100644
--- a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java
+++ b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java
@@ -90,6 +90,8 @@ public class PowerWebServiceImpl implements PowerWebService {
userWebServiceVo.setUserEmail(user.getDownloadRecord()+"");
//查看打印简要设置在职位字段
userWebServiceVo.setUserAge(user.getShowPrint());
+ //预览显示水印设置在年龄字段
+ userWebServiceVo.setUserSex(user.getShowWater());
userWebServiceVo.setMenus(menus);
}
}
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp
index b652e12..8e7c229 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp
@@ -143,9 +143,14 @@
免申请预览档案
免申请下载档案
- 查看打印简要
+
+
+
+ 预览显示水印
+ 查看打印简要
+
diff --git a/power-admin/src/main/webapp/static/js/role.js b/power-admin/src/main/webapp/static/js/role.js
index ed0d42f..f5beb85 100644
--- a/power-admin/src/main/webapp/static/js/role.js
+++ b/power-admin/src/main/webapp/static/js/role.js
@@ -195,6 +195,7 @@ function edit(id){
var showRecord = data.showRecord;
var downloadRecord = data.downloadRecord;
var showPrint = data.showPrint;
+ var showWater = data.showWater;
if(showRecord == 1){
$("input[name='showRecordCheckbox']").prop("checked",true);
$("#showRecord").val("1");
@@ -216,6 +217,13 @@ function edit(id){
$("input[name='showPrintCheckbox']").prop("checked",false);
$("#showPrint").val("0");
}
+ if(showWater == 1){
+ $("input[name='showWaterCheckbox']").prop("checked",true);
+ $("#showWater").val("1");
+ }else{
+ $("input[name='showWaterCheckbox']").prop("checked",false);
+ $("#showWater").val("0");
+ }
}
});
$('#myModal').modal('show')
@@ -277,6 +285,12 @@ $('#btn_submit').click(function () {
}else{
$("#showPrint").val(0);
}
+ var showWater = $("input[name='showWaterCheckbox']").is(":checked");
+ if(showWater){
+ $("#showWater").val(1);
+ }else{
+ $("#showWater").val(0);
+ }
var roleName = $("#re_roleName").val();
if(roleName != ''){
var roleId = $("#re_roleId").val();
diff --git a/power-dao/src/main/java/com/manage/entity/Power_Role.java b/power-dao/src/main/java/com/manage/entity/Power_Role.java
index 93acf91..54b924a 100644
--- a/power-dao/src/main/java/com/manage/entity/Power_Role.java
+++ b/power-dao/src/main/java/com/manage/entity/Power_Role.java
@@ -12,6 +12,8 @@ public class Power_Role{
private Short showPrint;
+ private Short showWater;
+
private String remark;
private Integer effective;
@@ -111,4 +113,12 @@ public class Power_Role{
public void setUpdater(String updater) {
this.updater = updater;
}
+
+ public Short getShowWater() {
+ return showWater;
+ }
+
+ public void setShowWater(Short showWater) {
+ this.showWater = showWater;
+ }
}
\ No newline at end of file
diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
index b404484..c14198d 100644
--- a/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
+++ b/power-dao/src/main/java/com/manage/vo/Power_UserVo.java
@@ -50,12 +50,22 @@ public class Power_UserVo extends Power_User {
private Integer showPrint;
+ private Integer showWater;
+
private Set menus;
private List menuList;
private List userList;
+ public Integer getShowWater() {
+ return showWater;
+ }
+
+ public void setShowWater(Integer showWater) {
+ this.showWater = showWater;
+ }
+
public Integer getShowPrint() {
return showPrint;
}
diff --git a/power-dao/src/main/resources/mapper/Power_RoleMapper.xml b/power-dao/src/main/resources/mapper/Power_RoleMapper.xml
index 08fe274..cb8aac2 100644
--- a/power-dao/src/main/resources/mapper/Power_RoleMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_RoleMapper.xml
@@ -7,6 +7,7 @@
+
@@ -15,7 +16,7 @@
- role_id, role_name, show_record, downLoad_record, show_print, remark, effective,
+ role_id, role_name, show_record, downLoad_record, show_print,show_water, remark, effective,
create_date, creater, update_date, updater