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

chenhaozhe

2025-06-26 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0

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

@@ -535,7 +535,11 @@
                }

                //根据页面的打开方式，判断过滤条件是否需要进行额外的添加
                addSWhereByOpenType();
                if (addSWhereByOpenType()) {
                    sWhere += "  order by éƒ¨é—¨ä»£ç "
                } else {
                    sWhere += "  order by èŒå‘˜ä»£ç "
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -1035,17 +1039,20 @@
                    sWhere += " and ç¦ç”¨æ ‡è®° = ''and å®¡æ ¸äºº !='' ";
                    DeptName = decodeURI(DeptName);//对URI è¿›è¡Œè§£ç 
                    if (DeptName != "undefined") {
                        sWhere += " and éƒ¨é—¨åç§° = '" + DeptName+"' ";
                        sWhere += " and éƒ¨é—¨åç§° = '" + DeptName + "' ";
                    }
                    if (typeof (HOrgID) != "undefined") {
                        Organ(HOrgID);
                    }
                    
                    return true;
                } else {
                    return false;
                }


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

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