src/main/java/com/gz/controller/system/DictController.java

@@ -129,4 +129,9 @@ public class DictController {
     List<Map> selectMiJiRole(Integer roleId){
         return dictService.selectMiJiRole(roleId);
     }
+
+    @GetMapping("selectDeptQx")
+    Integer selectDeptQx(Integer roleId){
+        return dictService.selectDeptQx(roleId);
+    }
 }

src/main/java/com/gz/mapper/system/MenuRoleMapper.java

@@ -2,6 +2,7 @@ package com.gz.mapper.system;
 
 import com.gz.dto.system.MenuRoleDTO;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -13,4 +14,6 @@ import tk.mybatis.mapper.common.Mapper;
 public interface MenuRoleMapper extends Mapper<MenuRoleDTO> {
     @Delete("delete from tab_menu_role where role_id = #{roleId}")
     Integer deleteByRoleId(Integer roleId);
+    @Select("select menu_id from tab_menu_role where role_id=#{id} and role_type=4 ")
+    Integer selectDeptQx(@Param("id") Integer id);
 }

src/main/java/com/gz/service/statistics/impl/SelectStatisticsServiceImpl.java

@@ -237,7 +237,8 @@ public class SelectStatisticsServiceImpl implements SelectStatisticsService {
             throw new BusinessException(500, "参数非文件见");
         }
         // 执行命令Format
-        final String commandFomat = "du -s {}";
+        final String commandFomat = "du -s -b {}";
+
         // 需要执行的命令
         final String command = StrUtil.format(commandFomat, file.getAbsoluteFile());
         log.info("文件夹大小扫描命令执行：{}", command);

src/main/java/com/gz/service/system/DictService.java

@@ -104,4 +104,11 @@ public interface DictService {
      * @since 2021/3/8 17:22
      */
     List<Map> selectMiJiRole(Integer roleId);
+
+    /**
+     * @description 部门权限
+     * @author LiuChangLan
+     * @since 2021/3/8 17:22
+     */
+    Integer selectDeptQx(Integer roleId);
 }

src/main/java/com/gz/service/system/impl/DictServiceImpl.java

@@ -191,4 +191,10 @@ public class DictServiceImpl implements DictService {
         }
         return result;
     }
+
+    @Override
+    public Integer selectDeptQx(Integer roleId) {
+
+        return this.menuRoleMapper.selectDeptQx(roleId);
+    }
 }

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 5120MB
@@ -22,7 +22,7 @@ auth:
     # 进行登录验证的地址
     force-urls: /**
     # 跳过验证地址
-    skip-urls: /druid/**,/,/**/*.pdf,/**/*.png,/**/*.jpg,/**/*.html,/**/*.ico,/**/*.css,/**/*.gif,/**/*.js,/webSocket/**,/**/*.woff2,/**/*.less,/system/auth/login,/system/auth/refreshToken,/system/auth/generatePictureCaptcha,/template/*.xlsx,/rabbit/test,/system/auth/loginByBase64
+    skip-urls: /druid/**,/,/**/*.pdf,/**/*.png,/**/*.jpg,/**/*.html,/**/*.ico,/**/*.css,/**/*.gif,/**/*.js,/webSocket/**,/**/*.woff2,/**/*.less,/system/auth/login,/system/auth/refreshToken,/system/auth/generatePictureCaptcha,/template/*.xlsx,/rabbit/test,/system/auth/loginByBase64,/system/admin/synchronize
 rabbitmq:
   # 数据交换机
   data-exchange: ARCHIVE_DATA_EXCHANGE

src/main/resources/static/page/role/editRole.html

@@ -19,7 +19,7 @@
 <div class="layuimini-container" style="width: 80%;margin: 0 auto">
     <div class="layui-form layuimini-form" lay-filter="addPaper">
         <div class="layui-row layui-col-space30">
-            <div class="layui-col-md2">
+            <div class="layui-col-md3">
                 <div class="layui-card">
                     <div class="layui-card-header"><i class="layui-icon layui-icon-menu-fill"></i>菜单权限</div>
                     <div class="layui-card-body">
@@ -27,7 +27,7 @@
                     </div>
                 </div>
             </div>
-            <div class="layui-col-md2">
+            <div class="layui-col-md3">
                 <div class="layui-card">
                     <div class="layui-card-header"><i class="layui-icon layui-icon-tree"></i>档案树权限</div>
                     <div class="layui-card-body">
@@ -51,17 +51,15 @@
                     </div>
                 </div>
             </div>
+            <div class="layui-col-md2">
+                <div class="layui-card">
+                    <div class="layui-card-header"><i class="layui-icon layui-icon-star"></i>档案权限</div>
+                    <div class="layui-card-body">
+                        <input type="checkbox" name="bmqx-role" lay-skin="switch" lay-filter="switchTest" lay-text="ON|OFF">
 
-            <div class="layui-col-md4">
-                <label class="layui-form-label">是否可查看全部门</label>
-                <div class="layui-input-block">
-                    <select  id="bmqx-role" name="interest" lay-filter="aihao">
-                        <option value="1" selected="">否</option>
-                        <option value="0">是</option>
-                    </select>
+                    </div>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
@@ -128,6 +126,20 @@
                 });
             })
         }
+        let initdept = () => {
+            http.get('system/dict/selectDeptQx', {roleId: id}, true, function (res) {
+                tree.render({
+                    elem: '#bmqx-role'
+                    , data: res.data
+                });
+                if(res.data==1){
+                        form.val('addPaper', {
+                            "bmqx-role": true //开关状态
+                        });
+                }
+            })
+
+        }
         let initArchiveTree = () => {
             http.get('system/archivesTree/selectArchiveRole', {roleId: id}, true, function (res) {
                 tree.render({
@@ -157,14 +169,13 @@
 
         //保存方法
         let save = function () {
-            console.log(document.getElementById("bmqx-role").value)
             let data = {
                 roleId: id,
                 menuIds: getChecked_list(tree.getChecked("menu-role")),
                 mjCodes: getChecked_list(tree.getChecked("miji-role")),
                 archiveTrees: getChecked_list(tree.getChecked("archive-tree-role")),
                 archiveShow: getChecked_list(tree.getChecked("archive-role")),
-                bmqxRole:document.getElementById("bmqx-role").value
+                bmqxRole:bmqxRole
             }
             console.log()
             http.post('system/role/setRole', data, true, function (res) {
@@ -186,6 +197,16 @@
         initTree()
         initArchiveTree()
         initMj()
+        initdept()
+
+        var bmqxRole=0
+        form.on('switch(switchTest)', function(data){
+            if(this.checked){
+                bmqxRole=1
+            }else {
+                bmqxRole=0
+            }
+        });
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {