合并分支

chenhaozhe

2025-06-26 ae4902061bc8e34f341d55b85f28acdf24d3b9dc

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -49,11 +49,11 @@
                string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 职员代码", "h_v_IF_EmployeeList");
                    ds = oCN.RunProcReturn(sql1 + sWhere, "h_v_IF_EmployeeList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by 职员代码";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
                }