Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml

@@ -478,7 +478,7 @@
     ID, NAME, MENUNAME, PID, PERMISSION, URL, DESCRIPTION, TYPE
     FROM
     sys_permission_new
-    where scbz = 0 AND flag=1/*生成菜单*/
+    where scbz = 0 AND flag=1 AND id like 'H01%' ORDER BY ID
   </select>
   <!--根据userid查询菜单-->
   <select id="selectMencusByUserId" resultType="com.xzxtshiro.pojo.SysPermissionNew">
@@ -487,8 +487,9 @@
     ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
     FROM
     VW_USER_PERMISSION
-    where flag=1/*生成菜单*/
+    where flag=1
     <if test="userId!=null">and USERID=#{userId,jdbcType=VARCHAR}</if>
+    AND id like 'H01%' ORDER BY ID
   </select>
 <!--查询用户列表-->
   <select id="selectSysUserByCondition" resultMap="BaseResultMap">

src/main/webapp/WEB-INF/jsp/admin/permission/list.jsp

@@ -40,7 +40,7 @@
                     <th lay-data="{field:'rn',align:'center', width:60, sort: true}">序号</th>
                     <th lay-data="{field:'id',align:'center', width:100}">权限ID</th>
                     <th lay-data="{field:'name',align:'center', width:150, sort: true}">权限名称</th>
-                    <th lay-data="{field:'permission', align:'center',width:150, sort: true}">权限代码</th>
+                    <%--<th lay-data="{field:'permission', align:'center',width:150, sort: true}">权限代码</th>--%>
                     <th lay-data="{field:'url', align:'center',width:200, sort: true}">权限URL</th>
                     <th lay-data="{field:'pid', align:'center',width:100, sort: true}">父级权限ID</th>
                     <th lay-data="{width:200, align:'center', toolbar: '#toolBar'}">操作</th>

src/main/webapp/WEB-INF/jsp/admin/user/add.jsp

@@ -287,7 +287,9 @@
 
         //出生日期转化
         var birthday = "${user.birthday}";
-        $("#birthday").val(formatTime(birthday));
+        if(birthday!=""){
+            $("#birthday").val(formatTime(birthday));
+        }
 
         form.render();
 

src/main/webapp/WEB-INF/jsp/admin/user/update.jsp

@@ -287,7 +287,9 @@
 
         //出生日期转化
         var birthday = "${user.birthday}";
-        $("#birthday").val(formatTime(birthday));
+        if(birthday!=""){
+            $("#birthday").val(formatTime(birthday));
+        }
 
         form.render();
         var data = ${unit};