Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2025-07-31 839331752af8dcc1ecb19d17feaa514710cf9751

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_CheckItem.html

@@ -570,10 +570,11 @@
                if (HName) {
                    sWhere += " and åç§° like '%" + HName + "%'";
                }
                if (HUSEORGID) {
                    sWhere += " and ä½¿ç”¨ç»„织名称 = '" + HUSEORGID + "'";
                }
                addSWhereByOpenType();
                //if (HUSEORGID) {
                //    sWhere += " and ä½¿ç”¨ç»„织名称 = '" + HUSEORGID + "'";
                //}
                addSWhereByOpenType();                
                sWhere += getOrgIDByUser();//用户关联组织查询过滤
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -971,6 +972,31 @@
            }
            //#endregion

            //#region æ ¹æ®ç”¨æˆ·èŽ·å–用户关联组织的过滤条件
            function getOrgIDByUser() {
                var res = "";
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //方法所在页面和方法名       ä¼ å‚ ç»„织必须是列表头部查询的组织  ä¸èƒ½ä½¿ç”¨ç”¨æˆ·é»˜è®¤            
                    data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HUSEORGID").val() },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data[0].sWhere == "1") {
                                res = " and ä½¿ç”¨ç»„织名称 = '" + $("#HUSEORGID").val() + "'";
                            } else {
                                res = result.data[0].sWhere;
                            }                           
                        } 
                    }, error: function (err) {
                        res = " and 1 = 0";
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });             
                return res;
            }
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //获取当前用户的默认过滤方案