Переглянути джерело

修改普通用户登录BUG

章政 7 роки тому
батько
коміт
e01625a000

+ 1 - 1
UAS-MES/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -100,7 +100,7 @@ namespace UAS_MES.CustomControl.AccordionMenu
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 //在这个Caller范围内的是用户可见的导航
-                if (dt.Rows[i]["UGP_IFDELETE"].ToString() == "1" || dt.Rows[i]["UGP_IFALL"].ToString() == "1")
+                if (dt.Rows[i]["UGP_IFREAD"].ToString() == "1" || dt.Rows[i]["UGP_IFALL"].ToString() == "1")
                 {
                     Callers += "'" + dt.Rows[i]["ugp_caller"].ToString() + "',";
                 }

+ 1 - 0
UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -312,6 +312,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             if (!TextBoxEnable1)
                 TextBox.BackColor = System.Drawing.Color.White;
             TextBox.Enabled = TextBoxEnable1;
+            Search_Icon.Power = this.Power;
         }
 
         private void SearchTextBox_SizeChanged(object sender, EventArgs e)

+ 1 - 1
UAS-MES/PublicMethod/LogicHandler.cs

@@ -414,7 +414,7 @@ namespace UAS_MES.PublicMethod
                 }
                 else
                 {
-                    dt = dh.getFieldsDatasByCondition("cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code", new string[] { "ur_resourcecode" }, "eg_emcode = '" + iUserCode + "' and sc_statuscode='AUDITED'");
+                    dt = dh.getFieldsDatasByCondition("cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code", new string[] { "ur_resourcecode" }, "upper(eg_emcode)= '" + iUserCode + "' and sc_statuscode='AUDITED'");
                     //如果存在该编号
                     if (dt.Rows.Count > 0)
                     {