From a655ee2cd869385c0cf8aadcf07bc8f2db256432 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 29 May 2020 10:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=8E=A5=E6=94=B6=E4=BA=BA?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8F=AF=E5=A4=9A=E9=80=89=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=A7=92=E8=89=B2=E6=97=A0=E4=B8=8B=E8=BD=BD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B7=AF=E5=BE=84/role/pageUINotDown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../com/manage/controller/RoleController.java | 91 ++ .../main/webapp/WEB-INF/jspf/webSocket.jspf | 3 +- .../WEB-INF/views/noticeDir/noticePage.jsp | 38 +- .../WEB-INF/views/roleDir/roleNotDown.jsp | 210 ++++ .../static/css/bootstrap-select.min.css | 2 +- .../src/main/webapp/static/js/noticePage.js | 35 +- .../src/main/webapp/static/js/roleNotDown.js | 293 +++++ .../角色列表导入模板无下载.xls | Bin 0 -> 18944 bytes power-dao/pom.xml | 5 - .../com/manage/dao/Power_NoticeMapper.java | 2 + .../resources/mapper/Power_NoticeMapper.xml | 1018 +++++++++-------- .../resources/mapper/Power_Sys_DictMapper.xml | 42 - .../com/manage/service/Power_RoleService.java | 7 + .../service/ipml/Power_NoticeServiceImpl.java | 35 +- .../service/ipml/Power_RoleServiceImpl.java | 24 + 16 files changed, 1257 insertions(+), 552 deletions(-) create mode 100644 power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp create mode 100644 power-admin/src/main/webapp/static/js/roleNotDown.js create mode 100644 power-admin/src/main/webapp/static/template/角色列表导入模板无下载.xls diff --git a/pom.xml b/pom.xml index ac03b33..3dc5642 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,8 @@ 3.5.0 5.0.2.RELEASE - 3.2.8 - 1.2.2 + 3.4.6 + 1.3.2 1.2.15 5.1.32 1.6.4 diff --git a/power-admin/src/main/java/com/manage/controller/RoleController.java b/power-admin/src/main/java/com/manage/controller/RoleController.java index 274e3a6..98a9c54 100644 --- a/power-admin/src/main/java/com/manage/controller/RoleController.java +++ b/power-admin/src/main/java/com/manage/controller/RoleController.java @@ -83,6 +83,18 @@ public class RoleController { CacheManager.addExcCount("noExc"); return "roleDir/role"; } + /** + * @Date 2019-4-25 + * @Author ly + * @Description 返回页面 + * */ + @OptionalLog(module = "查看",methods = "角色管理页面") + @RequiresPermissions(value="/role/pageUINotDown") + @RequestMapping("/pageUINotDown") + public String pageUINotDown(){ + CacheManager.addExcCount("noExc"); + return "roleDir/roleNotDown"; + } /** * @Date 2019-08-02 @@ -214,6 +226,23 @@ public class RoleController { e.printStackTrace(); } } + /** + * @Date 2019-4-25 + * @Author ly + * @Description 导出Excel + * */ + @OptionalLog(module = "导出excel",methods = "角色管理") + @RequiresPermissions(value="/role/export") + @RequestMapping("/exportNotDown") + public void exportNotDown(Power_RoleVo powerRole, HttpServletResponse response, HttpServletRequest request){ + try { + powerRoleService.exportNotDown(powerRole,response,request); + CacheManager.addExcCount("noExc"); + }catch (Exception e){ + CacheManager.addExcCount("exc"); + e.printStackTrace(); + } + } /** * @Date 2019-4-30 * @Author ly @@ -294,6 +323,68 @@ public class RoleController { } } } + + /** + * @Date 2019-10-11 + * @Author zengwh + * @Description 导入excel + * */ + @OptionalLog(module = "导入excel",methods = "角色管理") + @RequiresPermissions(value="/role/importExcel") + @RequestMapping(value="/importExcelNotDown",method = {RequestMethod.POST}) + @ResponseBody + public ResponseEntity importExcelNotDown(HttpServletRequest request){ + OutputStream os = null; + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.setContentType(new MediaType("text","html",Charset.forName("UTF-8"))); + try { + //读取文件 + MultipartResolver resolver = new CommonsMultipartResolver(request.getSession().getServletContext()); + MultipartHttpServletRequest multipartRequest = resolver.resolveMultipart(request); + MultipartFile multipartFile = multipartRequest.getFile("upfile"); + //属性名 + String[] fieldNames = {"roleName","remark","effective"}; + //判断集中类中的方法名 + String[] judgeMethods = {"judgeRoleName","judgeRemark","convertEffective"}; + //导入excel的操作 + Power_Role role = new Power_Role(); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + Power_UserVo user = (Power_UserVo)request.getSession().getAttribute("CURRENT_USER"); + role.setCreater(user.getUserName()); + role.setUpdater(user.getUserName()); + role.setCreateDate(fmt.format(new Date())); + role.setUpdateDate(fmt.format(new Date())); + //实例化 + ImportExcelUtil.newInstance("power_RoleMapper",role, Power_Role.class); + //导入excel的操作 + ImportExcelEntity excelEntity = ImportExcelUtil.fileImport(multipartFile,fieldNames, judgeMethods); + CacheManager.addExcCount("noExc"); + if(excelEntity.getSuccessCount() == 0 && excelEntity.getWrongCount() == 0){ + //无数据 + return new ResponseEntity("无数据!", responseHeaders, HttpStatus.OK); + } + if(excelEntity.getWrongCount() == 0){ + //成功 + return new ResponseEntity(null, responseHeaders, HttpStatus.OK); + }else{ + //有出错数据 + String msgStr = excelEntity.getWorkBookKey()+"@已成功导入"+excelEntity.getSuccessCount()+"条,失败"+excelEntity.getWrongCount()+"条,随后将导出错误记录!"; + return new ResponseEntity(msgStr, responseHeaders, HttpStatus.OK); + } + }catch (Exception e){ + CacheManager.addExcCount("exc"); + //抛异常 + return new ResponseEntity(e.getMessage(), responseHeaders, HttpStatus.OK); + }finally { + if(os != null){ + try { + os.close(); + }catch (Exception e){ + e.printStackTrace(); + } + } + } + } } diff --git a/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf b/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf index c958e54..122fc1f 100644 --- a/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf +++ b/power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf @@ -52,7 +52,7 @@ var webSocketUrl = $("#webSocketUrl").val(); var ws = new WebSocket("ws://"+webSocketUrl); ws.onopen = function(){ - ws.send(userId); + ws.send("power_"+userId); console.log("连接...") } @@ -71,6 +71,7 @@ } function narn (type,title,text,noticeId) { + debugger naranja()[type]({ title: title, text: text, diff --git a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp index 5527799..279c6d0 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp @@ -10,6 +10,9 @@ + + + @@ -110,6 +113,39 @@ .operBtns{ margin-left:10px; } + /*多选下拉框*/ + .dropdown-menu { + position: absolute; + top: 103%; + left: 0; + z-index: 1000; + display: none; + float: left; + list-style: none; + text-shadow: none; + max-height: 400px; + /*设置最大高度为400 overflow: scroll;*/ + /* 设置可滚动 padding: 5 px;*/ + margin: 0px; + -webkit-box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 8px rgba(120, 234, 61, 0.55); + font-size: 14px; + font-family: "Segoe UI", Helvetica, Arial, sans-serif; + border: 1px solid #ddd; + } + /** + *多选下拉框 + */ + .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){ + width: 168px!important; + } + .bootstrap-select>.dropdown-toggle.bs-placeholder{ + height: 30px!important; + } + .bootstrap-select>.dropdown-toggle.bs-placeholder{ + font-size: 12px!important; + } @@ -278,7 +314,7 @@
-
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp new file mode 100644 index 0000000..fb86912 --- /dev/null +++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp @@ -0,0 +1,210 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ include file="/WEB-INF/jspf/common.jspf" %> +<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %> + + + 角色管理 + + + + + + + +
+ + +
+
+

基本管理/角色管理

+
+
+
+
+ + +
+
+ +
+ +
+
+
+ + +
+
+ +
+
+
+
+
+
+ + + + + + + + + +
+
+
+
+
+ + + + + + + + +<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %> + + \ No newline at end of file diff --git a/power-admin/src/main/webapp/static/css/bootstrap-select.min.css b/power-admin/src/main/webapp/static/css/bootstrap-select.min.css index df885d0..71ae3e0 100644 --- a/power-admin/src/main/webapp/static/css/bootstrap-select.min.css +++ b/power-admin/src/main/webapp/static/css/bootstrap-select.min.css @@ -3,4 +3,4 @@ * * Copyright 2012-2019 SnapAppointments, LLC * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE) - */.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:250px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:18px;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none} \ No newline at end of file + */.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select .selectpicker:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:250px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){/*width:100%*/}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:18px;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none} \ No newline at end of file diff --git a/power-admin/src/main/webapp/static/js/noticePage.js b/power-admin/src/main/webapp/static/js/noticePage.js index a0eef72..aa0ad0a 100644 --- a/power-admin/src/main/webapp/static/js/noticePage.js +++ b/power-admin/src/main/webapp/static/js/noticePage.js @@ -183,6 +183,10 @@ function delNoticeType(){ //增加通知按钮 function addNotice(){ $("#noticeReceive").empty(); + //移除禁止修改 + $("#parentId").removeAttr("disabled"); + $("#noticeReceive").removeAttr("disabled"); + $("#noticeReceive").selectpicker("refresh"); $("#noticeId1").val(""); $("#form2")[0].reset(); $("#readFlag").val(""); @@ -199,7 +203,7 @@ $("#parentId").change(function(){ dataType:'json', success:function(data){ if(data.code == 100){ - var html = ''; + var html = ''; if(data.extend != ''){ var userName = $("#userName").val(); for (var i = 0; i < data.extend.userList.length; i++) { @@ -209,6 +213,7 @@ $("#parentId").change(function(){ } } $("#noticeReceive").append(html); + $("#noticeReceive").selectpicker('refresh'); } } }) @@ -219,16 +224,25 @@ $("#notice_submit").click(function(){ var noticeTitle = $("#noticeTitle").val(); var parentId = $("#parentId").val(); var noticeContent = $("#noticeContent").val(); + var noticeReceive = $("#noticeReceive").val(); if(noticeTitle == ''){ toastr.warning("通知主题不能为空!"); + $("#noticeTitle").focus(); }else{ if(parentId == ''){ toastr.warning("通知类型不能为空!"); + $("#parentId").focus(); }else{ if(noticeContent == ''){ toastr.warning("通知内容不能为空!"); + $("#noticeContent").focus(); }else{ - updateNotice(); + if(noticeReceive == ''){ + toastr.warning("接收人不能为空!"); + $("#noticeReceive").focus(); + }else{ + updateNotice(); + } } } } @@ -600,6 +614,9 @@ function editFlag(noticeId){ } //编辑通知 function edit(noticeId){ + //禁止修改 + $("#parentId").prop("disabled","disabled"); + $("#noticeReceive").prop("disabled","disabled"); $.ajax({ type:'get', url:path+'/notice/selectNoticeByNoticeId', @@ -620,16 +637,26 @@ function edit(noticeId){ async:false, success:function(data){ if(data.code == 100){ - var html = ''; + var html = ''; if(data.extend != ''){ var userName = $("#userName").val(); for (var i = 0; i < data.extend.userList.length; i++) { if (userName != data.extend.userList[i].userName) { - html += ''; + //定义是否匹配选中 + var flag = false; + if(notice.noticeReceive == data.extend.userList[i].userId){ + flag = true; + } + if(flag){ + html += ''; + }else{ + html += ''; + } } } } $("#noticeReceive").append(html); + $("#noticeReceive").selectpicker('refresh'); } } }) diff --git a/power-admin/src/main/webapp/static/js/roleNotDown.js b/power-admin/src/main/webapp/static/js/roleNotDown.js new file mode 100644 index 0000000..ba3d4c4 --- /dev/null +++ b/power-admin/src/main/webapp/static/js/roleNotDown.js @@ -0,0 +1,293 @@ +/** + * Created by ly on 2019/4/25. + */ +var pageNumber = 1; +var form = ''; +$(function(){ + $('#myModal').modal('hide'); + //先销毁表格 + $('#bootstrapTable').bootstrapTable({ + //表格高度 + height: getHeight(), + method : 'get', + url : path+ "/role/pageList",//请求路径 + striped : true, //是否显示行间隔色 + pageNumber : 1, //初始化加载第一页 + pagination : true,//是否分页 + sidePagination : 'server',//server:服务器端分页|client：前端分页 + pageSize : 10,//单页记录数 + pageList : [ 5, 10, 20, 30 ],//可选择单页记录数 + cache: false, + paginationPreText : '上一页', + paginationNextText : '下一页', + queryParams : function(params) {//上传服务器的参数 + var temp = {//如果是在服务器端实现分页，limit、offset这两个参数是必须的 + limit : params.limit, // 每页显示数量 + offset : params.offset, // SQL语句起始索引 + page : (params.offset / params.limit) + 1, //当前页码 + roleId:$("#role_id").val(), + roleName:$("#role_name").val(), + effective : $("#effective option:selected").val(), + creater:$("#creater").val(), + }; + return temp; + }, + columns : [{ + checkbox:true + }, + { + title:'序号', + field:'no', + formatter: function (value, row, index) { + //获取每页显示的数量 + var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize; + //获取当前是第几页 + if(pageNumber == 1){ + pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber; + } + //返回序号，注意index是从0开始的，所以要加上1 + return pageSize * (pageNumber - 1) + index + 1; + } + }, + { + title:'角色名', + field:'roleName', + }, + { + title:'备注', + field:'remark', + formatter:function (value,row,index) { + if(value ==null){ + return ""; + }else{ + return value; + } + } + }, + { + title:'是否有效', + field:'effective', + formatter: function (value, row, index) { + if(value ==1){ + return '是' + }else if(value ==0){ + return '否' + } + } + }, + { + title:'创建时间', + field:'createDate', + }, + { + title:'创建人', + field:'creater', + }, + + { + title:'操作', + field:'roleId', formatter: function(value,row,index){ + var editanddrop = ''; + if(row.isUpdate == 1){ + editanddrop += ''; + } + if(row.isDelete == 1){ + editanddrop += ''; + } + return editanddrop; + } + } + ], + onLoadSuccess: function(){ //加载成功时执行 + $(".page-list").show(); + $("th").css({'text-align':'center','vertical-align':'middle'}) + $("td").css({'text-align':'center','vertical-align':'middle'}) + }, + //监听分页点击事件 + onPageChange: function(num, type) { + pageNumber = num; + }, + //选中单个复选框 + onCheck:function(row){ + var checks = $("#checks").val(); + $("#checks").val(checks+=row.roleId + ","); + }, + //取消单个复选框 + onUncheck:function(row){ + var checks = $("#checks").val(); + checks = checks.replace(row.roleId + ",",""); + $("#checks").val(checks); + }, + //全选 + onCheckAll:function(rows){ + $("#checks").val(""); + var checks = ''; + for(var i=0;i list); } \ No newline at end of file diff --git a/power-dao/src/main/resources/mapper/Power_NoticeMapper.xml b/power-dao/src/main/resources/mapper/Power_NoticeMapper.xml index fcc1900..a184a41 100644 --- a/power-dao/src/main/resources/mapper/Power_NoticeMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_NoticeMapper.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + notice_id, sys_id, notice_type_flag, notice_type_name, notice_title, notice_content, notice_send, notice_date, notice_receive, effective, read_flag, parent_id, remark - - + + delete from power_notice where notice_id = #{noticeId,jdbcType=INTEGER} - + insert into power_notice (notice_id, sys_id, notice_type_flag, notice_type_name, notice_title, notice_content, notice_send, notice_date, notice_receive, @@ -42,134 +42,134 @@ #{effective,jdbcType=INTEGER}, #{readFlag,jdbcType=INTEGER}, #{parentId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}) - - insert into power_notice - - - notice_id, - - - sys_id, - - - notice_type_flag, - - - notice_type_name, - - - notice_title, - - - notice_content, - - - notice_send, - - - notice_date, - - - notice_receive, - - - effective, - - - read_flag, - - - parent_id, - - - remark, - - - - - #{noticeId,jdbcType=INTEGER}, - - - #{sysId,jdbcType=INTEGER}, - - - #{noticeTypeFlag,jdbcType=VARCHAR}, - - - #{noticeTypeName,jdbcType=VARCHAR}, - - - #{noticeTitle,jdbcType=VARCHAR}, - - - #{noticeContent,jdbcType=VARCHAR}, - - - #{noticeSend,jdbcType=VARCHAR}, - - - #{noticeDate,jdbcType=CHAR}, - - - #{noticeReceive,jdbcType=VARCHAR}, - - - #{effective,jdbcType=INTEGER}, - - - #{readFlag,jdbcType=INTEGER}, - - - #{parentId,jdbcType=INTEGER}, - - - #{remark,jdbcType=VARCHAR}, - - - - - update power_notice - - - sys_id = #{sysId,jdbcType=INTEGER}, - - - notice_type_flag = #{noticeTypeFlag,jdbcType=VARCHAR}, - - - notice_type_name = #{noticeTypeName,jdbcType=VARCHAR}, - - - notice_title = #{noticeTitle,jdbcType=VARCHAR}, - - - notice_content = #{noticeContent,jdbcType=VARCHAR}, - - - notice_send = #{noticeSend,jdbcType=VARCHAR}, - - - notice_date = #{noticeDate,jdbcType=CHAR}, - - - notice_receive = #{noticeReceive,jdbcType=VARCHAR}, - - - effective = #{effective,jdbcType=INTEGER}, - - - read_flag = #{readFlag,jdbcType=INTEGER}, - - - parent_id = #{parentId,jdbcType=INTEGER}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where notice_id = #{noticeId,jdbcType=INTEGER} - - + + insert into power_notice + + + notice_id, + + + sys_id, + + + notice_type_flag, + + + notice_type_name, + + + notice_title, + + + notice_content, + + + notice_send, + + + notice_date, + + + notice_receive, + + + effective, + + + read_flag, + + + parent_id, + + + remark, + + + + + #{noticeId,jdbcType=INTEGER}, + + + #{sysId,jdbcType=INTEGER}, + + + #{noticeTypeFlag,jdbcType=VARCHAR}, + + + #{noticeTypeName,jdbcType=VARCHAR}, + + + #{noticeTitle,jdbcType=VARCHAR}, + + + #{noticeContent,jdbcType=VARCHAR}, + + + #{noticeSend,jdbcType=VARCHAR}, + + + #{noticeDate,jdbcType=CHAR}, + + + #{noticeReceive,jdbcType=VARCHAR}, + + + #{effective,jdbcType=INTEGER}, + + + #{readFlag,jdbcType=INTEGER}, + + + #{parentId,jdbcType=INTEGER}, + + + #{remark,jdbcType=VARCHAR}, + + + + + update power_notice + + + sys_id = #{sysId,jdbcType=INTEGER}, + + + notice_type_flag = #{noticeTypeFlag,jdbcType=VARCHAR}, + + + notice_type_name = #{noticeTypeName,jdbcType=VARCHAR}, + + + notice_title = #{noticeTitle,jdbcType=VARCHAR}, + + + notice_content = #{noticeContent,jdbcType=VARCHAR}, + + + notice_send = #{noticeSend,jdbcType=VARCHAR}, + + + notice_date = #{noticeDate,jdbcType=CHAR}, + + + notice_receive = #{noticeReceive,jdbcType=VARCHAR}, + + + effective = #{effective,jdbcType=INTEGER}, + + + read_flag = #{readFlag,jdbcType=INTEGER}, + + + parent_id = #{parentId,jdbcType=INTEGER}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + where notice_id = #{noticeId,jdbcType=INTEGER} + + update power_notice set sys_id = #{sysId,jdbcType=INTEGER}, notice_type_flag = #{noticeTypeFlag,jdbcType=VARCHAR}, @@ -185,242 +185,242 @@ remark = #{remark,jdbcType=VARCHAR} where notice_id = #{noticeId,jdbcType=INTEGER} - - SELECT - notice_id + power_notice.notice_id, + power_sys_dict.parent_id sys_id, + power_notice1.notice_type_flag, + power_notice1.notice_type_name, + power_notice.notice_title, + power_notice.notice_content, + power_user.user_name notice_send, + power_notice.notice_date, + IF ( + power_notice.notice_receive = 'all', + 'all', + power_user1.user_name + ) notice_receive, + power_notice.effective, + power_notice.read_flag, + power_notice.parent_id, + power_notice.remark FROM + power_notice + LEFT JOIN power_notice AS power_notice1 ON power_notice.parent_id = power_notice1.notice_id + INNER JOIN power_sys_dict ON power_notice1.notice_type_flag = power_sys_dict.sys_flag + LEFT JOIN power_user ON power_notice.notice_send = power_user.user_id + LEFT JOIN power_user power_user1 ON power_notice.notice_receive = power_user1.user_id + WHERE + power_notice.notice_type_flag IS NULL + + AND ( + power_notice.notice_send = ${userId} + OR power_notice.notice_receive = ${userId} + OR ( + power_notice.notice_receive = 'all' + ) + AND power_notice1.notice_type_flag IN ( + SELECT + power_sys_dict.sys_flag + FROM + power_sys_dict + INNER JOIN power_user ON FIND_IN_SET( + power_sys_dict.dept_id, + power_user.dept_id + ) + AND power_user.user_id = ${userId} + UNION ALL + SELECT + power_sys_dict.sys_flag + FROM + power_sys_dict + LEFT JOIN power_user_dict ON power_user_dict.dict_id = power_sys_dict.parent_id + AND power_user_dict.user_id = ${userId} + WHERE + power_sys_dict.sys_type = '权限系统' + ) + ) + + + AND power_sys_dict.parent_id = ${sysId} + + + AND power_notice1.notice_type_flag = #{sysFlag} + + + + SELECT - notice_id, - notice_type_flag, - notice_type_name + notice_id, + notice_type_flag, + notice_type_name FROM - power_notice + power_notice WHERE - notice_type_flag IS NOT NULL - - AND notice_type_flag = #{noticeTypeFlag} - - - AND notice_id = ${noticeId} - + notice_type_flag IS NOT NULL + + AND notice_type_flag = #{noticeTypeFlag} + + + AND notice_id = ${noticeId} + SELECT - power_notice.notice_id, - a.sys_flag notice_type_flag, - power_notice.notice_type_name, - a.sys_name remark + power_notice.notice_id, + a.sys_flag notice_type_flag, + power_notice.notice_type_name, + a.sys_name remark FROM - ( - SELECT - sys_flag, - sys_name - FROM - power_sys_dict - - LEFT JOIN power_user ON FIND_IN_SET( - power_sys_dict.dept_id, - power_user.dept_id - ) - - WHERE - sys_flag IS NOT NULL - AND dict_status = 1 - AND parent_id IN ( - SELECT - dict_id - FROM - power_user_dict - WHERE - user_id = ${userId} - ) - - AND power_user.user_id = ${userId} - OR power_sys_dict.sys_type = '权限系统' - - GROUP BY - sys_flag - ) a + ( + SELECT + sys_flag, + sys_name + FROM + power_sys_dict + + LEFT JOIN power_user ON FIND_IN_SET( + power_sys_dict.dept_id, + power_user.dept_id + ) + + WHERE + sys_flag IS NOT NULL + AND dict_status = 1 + AND parent_id IN ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = ${userId} + ) + + AND power_user.user_id = ${userId} + OR power_sys_dict.sys_type = '权限系统' + + GROUP BY + sys_flag + ) a INNER JOIN power_notice ON a.sys_flag = power_notice.notice_type_flag @@ -612,8 +613,10 @@ @@ -965,54 +991,74 @@ + + + INSERT INTO power_notice( + sys_id, notice_type_flag, + notice_type_name, notice_title, notice_content, + notice_send, notice_date, notice_receive, + effective, read_flag, parent_id, + remark + ) + VALUES + + ( + #{record.sysId,jdbcType=INTEGER}, #{record.noticeTypeFlag,jdbcType=VARCHAR}, + #{record.noticeTypeName,jdbcType=VARCHAR}, #{record.noticeTitle,jdbcType=VARCHAR}, #{record.noticeContent,jdbcType=VARCHAR}, + #{record.noticeSend,jdbcType=VARCHAR}, #{record.noticeDate,jdbcType=CHAR}, #{record.noticeReceive,jdbcType=VARCHAR}, + #{record.effective,jdbcType=INTEGER}, #{record.readFlag,jdbcType=INTEGER}, #{record.parentId,jdbcType=INTEGER}, + #{record.remark,jdbcType=VARCHAR} + ) + + \ No newline at end of file diff --git a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml index 768c3be..76f876b 100644 --- a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml @@ -711,15 +711,6 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id) AND power_user.role_id != #{roleId} - - - - - - - -