diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index 9927d34..76bf0a8 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj
index cbf305b..87fc54c 100644
--- a/HJGL/BLL/BLL.csproj
+++ b/HJGL/BLL/BLL.csproj
@@ -10,7 +10,7 @@
Properties
BLL
BLL
- v4.6.1
+ v4.8
512
diff --git a/HJGL/BLL/app.config b/HJGL/BLL/app.config
index 3e98c00..c764f53 100644
--- a/HJGL/BLL/app.config
+++ b/HJGL/BLL/app.config
@@ -8,4 +8,4 @@
-
+
diff --git a/HJGL/FineUIPro.Web/File/Excel/20240509054820/焊工基本信息.xlsx b/HJGL/FineUIPro.Web/File/Excel/20240509054820/焊工基本信息.xlsx
new file mode 100644
index 0000000..d1e6cdb
Binary files /dev/null and b/HJGL/FineUIPro.Web/File/Excel/20240509054820/焊工基本信息.xlsx differ
diff --git a/HJGL/FineUIPro.Web/File/Excel/20240509055412/焊工基本信息.xlsx b/HJGL/FineUIPro.Web/File/Excel/20240509055412/焊工基本信息.xlsx
new file mode 100644
index 0000000..ddb6521
Binary files /dev/null and b/HJGL/FineUIPro.Web/File/Excel/20240509055412/焊工基本信息.xlsx differ
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 389359a..734d1dc 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
Properties
FineUIPro.Web
FineUIPro.Web
- v4.6.1
+ v4.8
true
diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config
index 92058ad..baa8804 100644
--- a/HJGL/FineUIPro.Web/Web.config
+++ b/HJGL/FineUIPro.Web/Web.config
@@ -9,7 +9,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs
index 579b858..6052d0c 100644
--- a/HJGL/FineUIPro.Web/WelderManage/WelderManage.aspx.cs
+++ b/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,22 +457,25 @@ namespace FineUIPro.Web.WelderManage
num = itemWelders.Count - 1;
ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + num, style, 0, 11);
//合并单元格
- region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
- ws.AddMergedRegion(region);
- region = new CellRangeAddress(rowIndex, rowIndex + num, 11, 11);
- ws.AddMergedRegion(region);
+ if (num > 0)
+ {
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 0, 0);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 1, 1);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 2, 2);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 3, 3);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 4, 4);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 5, 5);
+ ws.AddMergedRegion(region);
+ region = new CellRangeAddress(rowIndex, rowIndex + num, 10, 10);
+ 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);
//备注
diff --git a/HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs b/HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs
index 799616f..3d9d78c 100644
--- a/HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs
+++ b/HJGL/FineUIPro.Web/common/SysManage/UserList.aspx.cs
@@ -153,16 +153,23 @@
///
protected void btnMenuUnLock_Click(object sender, EventArgs e)
{
- if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
+ if (this.CurrUser.Account == Const.Gly)
{
- string userId = Grid1.SelectedRowID;
- Sys_UserService.UpdateErrorNum(userId, 0);
- Sys_UserService.UpdateLockTime(userId, null);
- ShowNotify("该用户解锁成功！", MessageBoxIcon.Success);
+ if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
+ {
+ string userId = Grid1.SelectedRowID;
+ Sys_UserService.UpdateErrorNum(userId, 0);
+ Sys_UserService.UpdateLockTime(userId, null);
+ ShowNotify("该用户解锁成功！", MessageBoxIcon.Success);
+ }
+ else
+ {
+ ShowNotify("请选择要解锁的用户！");
+ }
}
else
{
- ShowNotify("请选择要解锁的用户！");
+ ShowNotify("您没有这个权限，请与管理员联系！");
}
}
diff --git a/HJGL/Model/Model.csproj b/HJGL/Model/Model.csproj
index 09a27bd..78bcf82 100644
--- a/HJGL/Model/Model.csproj
+++ b/HJGL/Model/Model.csproj
@@ -10,7 +10,7 @@
Properties
Model
Model
- v4.6.1
+ v4.8
512
diff --git a/HJGL/WebApi/Web.config b/HJGL/WebApi/Web.config
index 0f75593..fa4b215 100644
--- a/HJGL/WebApi/Web.config
+++ b/HJGL/WebApi/Web.config
@@ -27,7 +27,7 @@
-->
-
+
diff --git a/HJGL/WebApi/WebApi.csproj b/HJGL/WebApi/WebApi.csproj
index 19ab4d2..0e1a2d7 100644
--- a/HJGL/WebApi/WebApi.csproj
+++ b/HJGL/WebApi/WebApi.csproj
@@ -14,7 +14,7 @@
Properties
WebApi
WebApi
- v4.6.1
+ v4.8
false
true