111

HJGL/FineUIPro.Web/Web.config

@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>

HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs

@@ -379,7 +379,7 @@ namespace FineUIPro.Web.WelderManage
 
             string strSql = @"SELECT Welder.WelderId, Welder.WelderCode, Welder.WelderName, Welder.UnitId,
                                      Welder.Birthday,(CASE WHEN Welder.Sex=1 THEN '男' ELSE '女' END) AS Sex,
-                                     Welder.IdentityCard,Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
+                                     Welder.IdentityCard, Welder.CertificateNum, Welder.CertificateValidity,
                                      Welder.WelderLevel, Welder.Remark,Unit.UnitName,Welder.IsOnDuty 
                                 FROM Welder_Welder AS Welder LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId 
                                 WHERE 1=1 ";
@@ -457,6 +457,8 @@ namespace FineUIPro.Web.WelderManage
                             num = itemWelders.Count - 1;
                             ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + num, style, 0, 11);
                             //合并单元格
+                            if (num > 0)
+                            {
                                 region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
                                 ws.AddMergedRegion(region);
                                 region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
@@ -473,6 +475,7 @@ namespace FineUIPro.Web.WelderManage
                                 ws.AddMergedRegion(region);
                                 region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
                                 ws.AddMergedRegion(region);
+                            }
                             int j = 0;
                             foreach (var item in itemWelders)
                             {
@@ -513,7 +516,7 @@ namespace FineUIPro.Web.WelderManage
                         string isOnDutyStr = string.Empty;
                         if (dt.Rows[i]["IsOnDuty"] != null)
                         {
-                            isOnDutyStr = dt.Rows[i]["IsOnDuty"].ToString() == "1" ? "在场" : "离场";
+                            isOnDutyStr = dt.Rows[i]["IsOnDuty"].ToString() == "True" ? "在场" : "离场";
                         }
                         ws.GetRow(rowIndex).GetCell(10).SetCellValue(isOnDutyStr);
                         //备注

HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs

@@ -152,6 +152,8 @@
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void btnMenuUnLock_Click(object sender, EventArgs e)
+        {
+            if (this.CurrUser.Account == Const.Gly)
             {
                 if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
                 {
@@ -165,6 +167,11 @@
                     ShowNotify("请选择要解锁的用户！");
                 }
             }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！");
+            }
+        }
 
         protected void btnMenuView_Click(object sender, EventArgs e)
         {