From 34bd6fa523c8ea77aa308891a821978c79c79aaa Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Thu, 24 Nov 2022 22:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE=E9=A2=84=E8=A7=88=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webservice/impl/PowerWebServiceImpl.java       |  2 ++
 .../src/main/webapp/WEB-INF/views/roleDir/role.jsp |  7 ++++++-
 power-admin/src/main/webapp/static/js/role.js      | 14 ++++++++++++++
 .../main/java/com/manage/entity/Power_Role.java    | 10 ++++++++++
 .../src/main/java/com/manage/vo/Power_UserVo.java  | 10 ++++++++++
 .../src/main/resources/mapper/Power_RoleMapper.xml |  9 ++++++++-
 .../src/main/resources/mapper/Power_UserMapper.xml |  1 +
 7 files changed, 51 insertions(+), 2 deletions(-)

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 @@
                         <label for="re_effective" class="control-label left">档案管理系统权限：</label>
                         <input type="checkbox" name="showRecordCheckbox">免申请预览档案
                         <input type="checkbox" name="downloadRecordCheckbox">免申请下载档案
-                        <input type="checkbox" name="showPrintCheckbox">查看打印简要
                         <input type="hidden" name="showRecord" id="showRecord">
                         <input type="hidden" name="downloadRecord" id="downloadRecord">
+                    </div>
+                    <div class="formDiv">
+                        <label for="re_effective" class="control-label left">档案管理系统权限：</label>
+                        <input type="checkbox" name="showWaterCheckbox">预览显示水印
+                        <input type="checkbox" name="showPrintCheckbox">查看打印简要
+                        <input type="hidden" name="showWater" id="showWater">
                         <input type="hidden" name="showPrint" id="showPrint">
                     </div>
                     <div class="formDiv">
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<String> menus;
 
     private List<User_Dept_Menu> menuList;
 
     private List<User> 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 @@
         <result column="show_record" property="showRecord" jdbcType="SMALLINT" />
         <result column="downLoad_record" property="downloadRecord" jdbcType="SMALLINT" />
         <result column="show_print" property="showPrint" jdbcType="SMALLINT" />
+        <result column="show_water" property="showWater" jdbcType="SMALLINT" />
         <result column="remark" property="remark" jdbcType="VARCHAR" />
         <result column="effective" property="effective" jdbcType="INTEGER" />
         <result column="create_date" property="createDate" jdbcType="CHAR" />
@@ -15,7 +16,7 @@
         <result column="updater" property="updater" jdbcType="VARCHAR" />
     </resultMap>
     <sql id="Base_Column_List" >
-    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
   </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -56,6 +57,9 @@
             <if test="showPrint != null" >
                 show_print,
             </if>
+            <if test="showWater != null" >
+                show_water,
+            </if>
             <if test="remark != null" >
                 remark,
             </if>
@@ -126,6 +130,9 @@
             <if test="showPrint != null" >
                 show_print = #{showPrint,jdbcType=SMALLINT},
             </if>
+            <if test="showWater != null" >
+                show_water = #{showWater,jdbcType=SMALLINT},
+            </if>
             <if test="remark != null" >
                 remark = #{remark,jdbcType=VARCHAR},
             </if>
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 26c7cb3..9247365 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -237,6 +237,7 @@
         power_role.show_record,
         power_role.downLoad_record,
         power_role.show_print,
+        power_role.show_water,
         user_name,
         NAME,
         user_sex,