没有批准的就不显示在列表中

username@email.com

2025-10-16 40eacc41d6f70f64ffd8f1fd18a8e12bce3fd86d

 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs

@@ -48,6 +48,7 @@
        OA_CarManageBll bll_OA_CarManageBll = null;
        OA_PropertyCateBLL bll_OA_PropertyCateBLL = null;
        OA_PropertyManageBLL bll_OA_PropertyManageBLL = null;
        OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
        OA_StaffPostBLL bll_OA_StaffPostBLL = null;
        OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
        OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
@@ -90,6 +91,7 @@
            bll_OA_CarManageBll = new OA_CarManageBll();
            bll_OA_PropertyCateBLL = new OA_PropertyCateBLL();
            bll_OA_PropertyManageBLL = new OA_PropertyManageBLL();
            bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
            bll_OA_StaffPostBLL = new OA_StaffPostBLL();
            bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
            bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
@@ -241,6 +243,10 @@
            else if (Request["dateType"] == "propertyNamecheckname")
            {
                Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
            }
            else if (Request["dateType"] == "shebeiNamecheckname")
            {
                Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
            }
            else if (Request["dateType"] == "resumeCateChange")
            {
@@ -1282,7 +1288,7 @@
        {
            try
            {
                if (CurrentUser.MemberType == "管理员")
                if (CurrentUser.MemberType == "管理员" || !CurrentUser.StaffId.HasValue || CurrentUser.StaffId.Value == 0)
                {
                    return "";
                }
@@ -1292,30 +1298,31 @@
                    MenuPath = MenuPath.Replace("..", "");
                    var sss = bll_Sys_Permissions_UserCaseBLL.GetNoExitCaseList(MenuPath, m_Sys_Permissions_UserRoleRelation.RoleId);

                    sss = sss.Where(x => x.Keyid == 12121212121);
                   //if(sss!=null && sss.Count() > 0)
                   // {
                   //     var roleRel = bll_OA_FirmRoleBLL.SelectOA_StaffRoleRel(CurrentUser.StaffId);
                   //     if (roleRel != null)
                   //     {
                   //         List<OA_FirmRolePermissionsRel> m_OA_FirmRolePermissionsRelList = bll_OA_FirmRoleBLL.SelectListByRoleId(roleRel.RoleId) as List<OA_FirmRolePermissionsRel>;
                   //         if (m_OA_FirmRolePermissionsRelList != null && m_OA_FirmRolePermissionsRelList.Count > 0)
                   //         {
                   //             List<int?> Menus = new List<int?>();
                   //             foreach (var m_Sys_Permissions_Menu in m_OA_FirmRolePermissionsRelList)
                   //             {
                   //                 // Menus.Add(m_Sys_Permissions_Menu.MenuIdOne + "-" + m_Sys_Permissions_Menu.MenuIdTwo + "-" + m_Sys_Permissions_Menu.MenuIdThree + "+" + "0");
                   //                 string[] fucns = m_Sys_Permissions_Menu.FuncGroup.Split(',');
                   //                 foreach (var item in fucns)
                   //                 {
                   //                     Menus.Add(item.ToInt32());
                   //                 }
                   //             }
                   //             sss = sss.Where(x => !Menus.Contains(x.Keyid));
                   //         }
                   //     }
                   // }
                        
                    //sss = sss.Where(x => x.Keyid == 12121212121);
                    if (sss != null && sss.Count() > 0)
                    {
                        var aaaa = sss.FirstOrDefault();
                        var roleRel = bll_OA_FirmRoleBLL.SelectOA_StaffRoleRel(CurrentUser.StaffId);
                        if (roleRel != null)
                        {
                            var m_OA_FirmRolePermissionsRelList = bll_OA_FirmRoleBLL.SelectListByRoleId(roleRel.RoleId).Where(x=>x.MenuIdThree == aaaa.MenuId);
                            if (m_OA_FirmRolePermissionsRelList != null)
                            {
                                List<int?> Menus = new List<int?>();
                                foreach (var m_Sys_Permissions_Menu in m_OA_FirmRolePermissionsRelList)
                                {
                                    // Menus.Add(m_Sys_Permissions_Menu.MenuIdOne + "-" + m_Sys_Permissions_Menu.MenuIdTwo + "-" + m_Sys_Permissions_Menu.MenuIdThree + "+" + "0");
                                    string[] fucns = m_Sys_Permissions_Menu.FuncGroup.Split(',');
                                    foreach (var item in fucns)
                                    {
                                        Menus.Add(item.ToInt32());
                                    }
                                }
                                sss = sss.Where(x => !Menus.Contains(x.Keyid));
                            }
                        }
                    }

                    return JsonHelper.GetJsonStringByObject(sss);
                }
            }
@@ -1419,6 +1426,22 @@
        public int IsExitsPropertyNameCateName(string Name, string Keyid)
        {
            return bll_OA_PropertyManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
        }

        #endregion


        #region 检测行政物品是否重复

        /// <summary>
        /// 检测行政物品是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsShebeiNameCateName(string Name, string Keyid)
        {
            return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
        }

        #endregion
@@ -1683,12 +1706,11 @@
            OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
            DateTime? calculateTimeStart = (calculateTimeString.Replace("年", "-").Replace("月", "-") + "1").ToDateTime2();
            DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);

            //奖励和罚款
            Pagination pa = new Pagination();
            pa.PageSize = 500;
            pa.PageIndex = 1;
            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
            List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
            if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
            {
                m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;