优化用户查询

用户管理增加查询

src/main/java/cn/hnthyy/thmz/controller/mz/RoleController.java

@@ -13,6 +13,7 @@ import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
 import cn.hnthyy.thmz.service.thmz.MenuService;
 import cn.hnthyy.thmz.service.thmz.RoleMenuRelationService;
 import cn.hnthyy.thmz.service.thmz.RoleService;
+import cn.hnthyy.thmz.service.thmz.UserService;
 import cn.hnthyy.thmz.vo.RoleMenuRelationVo;
 import cn.hnthyy.thmz.vo.RoleMenuVo;
 import cn.hnthyy.thmz.vo.RoleVo;
@@ -30,6 +31,8 @@ public class RoleController {
     @Autowired
     private RoleService roleService;
     @Autowired
+    private UserService userService;
+    @Autowired
     private RoleMenuRelationService roleMenuRelationService;
     @Autowired
     private MenuService menuService;
@@ -45,6 +48,10 @@ public class RoleController {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             List<RoleVo> roles = roleService.queryAllRole();
+            for (RoleVo role : roles) {
+                User user = userService.queryUserById(role.getUpdateId());
+                role.setUpdateName(user.getUserName());
+            }
             resultMap.put("code", 0);
             resultMap.put("message", "查询所有角色成功");
             resultMap.put("data", roles);

src/main/java/cn/hnthyy/thmz/mapper/thmz/RoleMapper.java

@@ -16,7 +16,7 @@ public interface RoleMapper {
      *
      * @return
      */
-    @Select("SELECT r.*,u.user_name AS update_name FROM t_role AS r LEFT JOIN t_user u on r.update_id = u.id WHERE r.del_flag=0 ")
+    @Select("SELECT r.* FROM t_role AS r WHERE r.del_flag=0 ")
     List<RoleVo> selectAll();
 
     /**

src/main/java/cn/hnthyy/thmz/mapper/thmz/UserMapper.java

@@ -37,7 +37,7 @@ public interface UserMapper {
                     " and user_code = #{userCode}" +
                     "</when>"+
                     "<when test='userName != null'>" +
-                    " and user_name = #{userName}" +
+                    " and user_name like '%${userName}%'" +
                     "</when>" +
                     " ORDER BY ID desc limit #{offset},#{pageSize} ",
             "</script>"})
@@ -61,7 +61,7 @@ public interface UserMapper {
                     " and user_code = #{userCode}" +
                     "</when>"+
                     "<when test='userName != null'>" +
-                    " and user_name = #{userName}" +
+                    " and user_name like '%${userName}%'" +
                     "</when>",
             "</script>"})
     int countUser(UserVo userVo);

src/main/resources/static/js/role_manage.js

@@ -9,7 +9,10 @@ $(function () {
     });
     //角色保存按钮点击事件
     $("#btn_save").click(function (t) {
-        saveRole();
+        var validatorResult = validator.checkAll($("#editRoleForm"));
+        if (validatorResult) {
+            saveRole();
+        }
     });
     //初始化表格数据
     getAllRole();
@@ -111,7 +114,7 @@ $(document).click(function(e){
 function saveRole() {
     var menus = $("#relationTypeId").val();
     var menuIds=null;
-    if(menus.length>0){
+    if(menus!=null && menus.length>0){
         for (var i=0;i<menus.length;i++){
             if(menuIds==null){
                 menuIds=menus[i];
@@ -119,6 +122,9 @@ function saveRole() {
                 menuIds+=","+menus[i];
             }
         }
+    }else{
+        errorMesage({message:"菜单权限不能为空"});
+        return;
     }
     var id = $("#id").val();
     var data = null;

src/main/resources/static/js/user_manage.js

@@ -8,7 +8,10 @@ $(function () {
     });
     //角色保存按钮点击事件
     $("#btn_save").click(function (t) {
-        saveUser();
+        var validatorResult = validator.checkAll($("#editUserForm"));
+        if (validatorResult) {
+            saveUser();
+        }
     });
     //初始化表格数据
     getAllUser();
@@ -246,7 +249,9 @@ function getAllUser() {
 function queryParams(params) {
     var temp = {
         pageSize: params.limit,
-        offset:params.offset,
+        offset: params.offset,
+        userCode: $("#userCodeSearch").val()==""?null:$("#userCodeSearch").val(),
+        userName: $("#userNameSearch").val()==""?null:$("#userNameSearch").val()
     };
     return temp;
 };
@@ -257,7 +262,6 @@ function queryParams(params) {
  * @param row
  */
 function editUser(row) {
-    console.log(row);
     clearInput();
     $("#classTitle").text("修改");
     $("#id").val(row.user.id);

src/main/resources/templates/role_manage.html

@@ -34,24 +34,25 @@
                 <h4 class="modal-title">角色管理【<span id="classTitle">新增</span>】</h4>
             </div>
             <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate id="editUserForm" autocomplete="off">
-                    <div class="item form-group thmz_alert">
+                <form class="form-horizontal form-label-left" novalidate id="editRoleForm" autocomplete="off">
+                    <div class="item form-group ">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="roleName">角色名称 <span
                                 class="required">*</span>
                         </label>
-                        <div class="col-md-6 col-sm-6 col-xs-12">
+                        <div class="col-md-5 col-sm-5 col-xs-12">
                             <input id="id" type="hidden"/>
                             <input id="roleName" class="form-control optional" type="text"
-                                   data-validate-length-range="0,10"
-                                   placeholder="请输入">
+                                   data-validate-length-range="1,10"
+                                   placeholder="请输入" required="required" >
                         </div>
                     </div>
-                    <div class="item form-group thmz_alert">
-                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="relationTypeId">菜单权限
+                    <div class="item form-group ">
+                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="relationTypeId">菜单权限 <span
+                                class="required">*</span>
                         </label>
-                        <div class="col-md-6 col-sm-6 col-xs-12">
+                        <div class="col-md-5 col-sm-5 col-xs-12">
                             <!--  select用于存放值，后台等获取用  -->
-                            <select id="relationTypeId" name="relationTypeId" style="display: none" multiple="multiple">
+                            <select id="relationTypeId" name="relationTypeId" hidden="hidden" multiple="multiple" required="required" >
                             </select>
                             <div class="form-group form-group-sm" style="position: relative;">
                                 <!-- 点击显示按钮 -->
@@ -67,10 +68,10 @@
                             </div>
                         </div>
                     </div>
-                    <div class="item form-group thmz_alert">
+                    <div class="item form-group ">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="remark">备注
                         </label>
-                        <div class="col-md-6 col-sm-6 col-xs-12">
+                        <div class="col-md-5 col-sm-5 col-xs-12">
                             <textarea  id="remark" class="form-control optional"
                                    data-validate-length-range="0,255" rows="3" />
                         </div>

src/main/resources/templates/user_manage.html

@@ -12,11 +12,22 @@
         <div class="x_panel">
             <div class="panel-body">
                 <form id="formSearch" class="form-horizontal" autocomplete="off">
-                    <div class="form-group col-md-12 col-sm-12 col-xs-12">
-                        <button type="button" id="btn_add" class="btn btn-primary"
-                                title="新增用户" style="display: none;"><i class="fa fa-plus"></i>
+                    <div class="item form-group ">
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="userCodeSearch">工号
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
+                            <input id="userCodeSearch" class="form-control optional" type="text">
+                        </div>
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="userCodeSearch">姓名
+                        </label>
+                        <div class="col-md-2 col-sm-2 col-xs-12">
+                            <input id="userNameSearch" class="form-control optional" type="text">
+                        </div>
+                        <button type="button" id="btn_search" class="btn btn-primary"
+                                title="查询用户" onclick="getAllUser()"><i class="glyphicon glyphicon-search"></i>
                         </button>
                     </div>
+
                 </form>
             </div>
             <table id="tb_table"></table>
@@ -35,26 +46,26 @@
             </div>
             <div class="modal-body">
                 <form class="form-horizontal form-label-left" novalidate id="editUserForm" autocomplete="off">
-                    <div class="item form-group thmz_alert">
+                    <div class="item form-group ">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="userCode">工号 <span
                                 class="required">*</span>
                         </label>
                         <div class="col-md-6 col-sm-6 col-xs-12">
                             <input id="id" type="hidden"/>
-                            <input id="userCode" class="form-control optional" type="text"
+                            <input id="userCode" class="form-control optional" type="text" required="required"
                                    readonly="readonly">
                         </div>
                     </div>
-                    <div class="item form-group thmz_alert">
+                    <div class="item form-group ">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="userName">姓名 <span
                                 class="required">*</span>
                         </label>
                         <div class="col-md-6 col-sm-6 col-xs-12">
-                            <input id="userName" class="form-control optional" type="text"
+                            <input id="userName" class="form-control optional" type="text" required="required"
                                    readonly="readonly">
                         </div>
                     </div>
-                    <div class="item form-group thmz_alert">
+                    <div class="item form-group ">
                         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="roleName">角色 <span
                                 class="required">*</span>
                         </label>