1.菜单授权仅展示有权限的

src/main/java/com/baosight/xservices/xs/sql/XS0702.xml

@@ -21,25 +21,22 @@
             <isNotEmpty prepend=" AND " property="notNodeEnames">
                 node_ename not in <iterate close=")" open="(" conjunction="," property="notNodeEnames">#notNodeEnames[]#</iterate>
             </isNotEmpty>
-            <!-- 非管理员非root节点仅显示有权限的菜单 added by songx at 20240126 -->
-            <isNotEqual property="node" compareValue="root">
-                <isEqual prepend=" AND " property="isUserAdmin" compareValue="0">
-                    (exists (
-                        select
-                            c. object_id, d.resource_ename
-                        from ${platSchema}.xs_user a,
-                            ${platSchema}.xs_user_group_member b,
-                            ${platSchema}.xs_authorization c,
-                            ${platSchema}.xs_resource d
-                        where a.user_id = b.member_id
-                        and b.parent_id = c.subject_id
-                        and c.object_id = d.id
-                        and a.login_name = #loginName#
-                        and d.type = 'PAGE'
-                        and m.node_ename = d.resource_ename
-                    ) or node_type = '2')
-                </isEqual>
-            </isNotEqual>
+            <!-- 非管理员仅展示有权限的菜单 added by songx at 20240809 -->
+            <isEqual prepend=" AND " property="isUserAdmin" compareValue="0">
+                exists (
+                    select c.object_id, d.resource_ename
+                    from ${platSchema}.xs_user a,
+                    ${platSchema}.xs_user_group_member b,
+                    ${platSchema}.xs_authorization c,
+                    ${platSchema}.xs_resource d
+                    where a.user_id = b.member_id
+                    and b.parent_id = c.subject_id
+                    and c.object_id = d.id
+                    and a.login_name = #loginName#
+                    and d.type = 'PAGE'
+                    and find_in_set(d.resource_ename, (select queryMenuPageInfo(m.node_ename)))
+                )
+            </isEqual>
         </dynamic>
         UNION
         SELECT

src/main/webapp/HP/KC/HPKC103A.js

@@ -26,9 +26,14 @@ $(function () {
 					refreshSelect(container, inInfo);
 				}
 			}, {
+				field: "applyNum",
+				template: function (model) {
+					return model.applyNum ? model.applyNum + "%" : "";
+				}
+			}, {
 				field: "completeNum",
 				template: function (model) {
-					return model.completeNum + "%";
+					return model.completeNum ? model.completeNum + "%" : "";
 				}
 			}],
 			dataBound: function () {
@@ -43,7 +48,7 @@ $(function () {
 
 	// 选择
 	$("#BTN_SELECT").on("click", select);
-	downKeyUp();
+
 });
 
 /**
@@ -53,7 +58,9 @@ $(window).load(function () {
 	// 初始化查询
 	query();
 	// 仓库名称
-	initWh()
+	initWh();
+	// 键盘按键
+	downKeyUp();
 });
 
 /**