diff --git a/README/Statement b/README/Statement
index d8d883c..9c3ef53 100644
--- a/README/Statement
+++ b/README/Statement
@@ -1,6 +1,10 @@
-加入国密算法的内容：
- 1.涉密人员培训地址
- 2.涉密人员离职离职原因
- 3.涉密网络登记网络名称
- 4.检查通知管理被通知人
+*注：SM4为对称加密算法，常用来做敏感数据的加解密以及MAC算法进行数据完整性保护等场景。
+加入国密算法（SM4）的内容：
+ 1.涉密人员培训----地址
+ 2.涉密人员离职----离职原因
+ 3.涉密网络登记----网络名称
+ 4.检查通知管理----被通知人
+ 5.维修商管理维----修单位名称
+ 6.涉密资产登记----使用人员
+
diff --git a/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/smjc/CheckManageServlet.class b/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/smjc/CheckManageServlet.class
index f9c1c59..c5129b1 100644
Binary files a/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/smjc/CheckManageServlet.class and b/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/smjc/CheckManageServlet.class differ
diff --git a/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/wxs/IndentureManageServlet.class b/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/wxs/IndentureManageServlet.class
index a91b71e..916754b 100644
Binary files a/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/wxs/IndentureManageServlet.class and b/out/artifacts/zhyw_war_exploded/WEB-INF/classes/com/zky/zhyw/wxs/IndentureManageServlet.class differ
diff --git a/out/artifacts/zhyw_war_exploded/config/config1/logs/SVSClient_system.log b/out/artifacts/zhyw_war_exploded/config/config1/logs/SVSClient_system.log
index 1ff89d0..f832a99 100644
--- a/out/artifacts/zhyw_war_exploded/config/config1/logs/SVSClient_system.log
+++ b/out/artifacts/zhyw_war_exploded/config/config1/logs/SVSClient_system.log
@@ -49,3 +49,5 @@ INFO [2023-12-11 17:02:26 465] Load HSM config IP1:10.10.3.2,Port1:8000
INFO [2023-12-11 17:02:30 617] BJCA Client Version:2.0 Build20210118
INFO [2023-12-11 17:04:48 758] Load HSM config IP1:10.10.3.2,Port1:8000
INFO [2023-12-11 17:04:48 962] BJCA Client Version:2.0 Build20210118
+INFO [2023-12-13 10:32:51 355] Load HSM config IP1:10.10.3.2,Port1:8000
+INFO [2023-12-13 10:32:51 533] BJCA Client Version:2.0 Build20210118
diff --git a/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpByIdEdit.jsp b/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpByIdEdit.jsp
index 9bafae1..22c9834 100644
--- a/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpByIdEdit.jsp
+++ b/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpByIdEdit.jsp
@@ -49,7 +49,8 @@
empid = buf.fget("empid ",pos);
empname = buf.fget("empname ",pos);
sj = buf.fget("frameworkid ",pos);
- birthday = Common.convertNull(buf.fget("birthday ",pos)).substring(0,10);
+ //birthday = Common.convertNull(buf.fget("birthday ",pos)).substring(0,10);
+ birthday = buf.fget("birthday ",pos);
sex = buf.fget("sex ",pos);
empcontaddr = buf.fget("empcontaddr ",pos);
empcontphone = buf.fget("empcontphone ",pos);
diff --git a/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpEdit.jsp b/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpEdit.jsp
index a5cce2b..c46a4fe 100644
--- a/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpEdit.jsp
+++ b/out/artifacts/zhyw_war_exploded/zhyw/smry/rydj/EmpEdit.jsp
@@ -343,8 +343,8 @@ html {
if (!sex.equals("")) {
%>
+ form1.sex.value='<%=sex%>';
+
<%
}
} else {
diff --git a/src/main/java/com/zky/zhyw/smjc/CheckManageServlet.java b/src/main/java/com/zky/zhyw/smjc/CheckManageServlet.java
index 2311a45..00eae3d 100644
--- a/src/main/java/com/zky/zhyw/smjc/CheckManageServlet.java
+++ b/src/main/java/com/zky/zhyw/smjc/CheckManageServlet.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zky.bjca.SM4;
-import org.apache.axis.encoding.Base64;
+import cn.org.bjca.utils.Base64;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -91,7 +91,7 @@ public class CheckManageServlet extends DispatchServlet {
prep.setString(2,checkStartTime);
prep.setString(3,login.getAreaid());
prep.setString(4,login.getCompanyid());
- prep.setString(5, Base64.encode(SM4.SM4Encrypt(checkName)));
+ prep.setString(5,checkName);
prep.setString(6,checkContentry);
prep.setString(7,checkContentwj);
prep.setString(8,checkContentsb);
@@ -164,7 +164,7 @@ public class CheckManageServlet extends DispatchServlet {
prep.setString(2,departId);
prep.setString(3,notifyTime);
prep.setString(4,notifyContent);
- prep.setString(5,notifyStaffed);
+ prep.setString(5,Base64.toBase64String(SM4.SM4Encrypt(notifyStaffed)));
prep.setString(6,qj);
prep.setString(7,sj);
prep.execute();
diff --git a/src/main/java/com/zky/zhyw/wxs/IndentureManageServlet.java b/src/main/java/com/zky/zhyw/wxs/IndentureManageServlet.java
index 324c846..e5f0ff1 100644
--- a/src/main/java/com/zky/zhyw/wxs/IndentureManageServlet.java
+++ b/src/main/java/com/zky/zhyw/wxs/IndentureManageServlet.java
@@ -9,6 +9,8 @@ import java.sql.SQLException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import cn.org.bjca.utils.Base64;
+import com.zky.bjca.SM4;
import com.zky.manager.Login;
import com.zky.pub.Common;
import com.zky.pub.DbConn;
@@ -46,7 +48,7 @@ PreparedStatement pstmt ,pstmt1 ;
conn=DbConn.getConn();
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,indentureId);
- pstmt.setString(2,indentureName);
+ pstmt.setString(2, Base64.toBase64String(SM4.SM4Encrypt(indentureName)));
pstmt.setString(3,indentureAddress);
pstmt.setString(4,indenturePhone);
pstmt.setString(5,indentureMobile);
diff --git a/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class b/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class
index f9c1c59..c5129b1 100644
Binary files a/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class and b/target/classes/com/zky/zhyw/smjc/CheckManageServlet.class differ
diff --git a/target/classes/com/zky/zhyw/wxs/IndentureManageServlet.class b/target/classes/com/zky/zhyw/wxs/IndentureManageServlet.class
index a91b71e..916754b 100644
Binary files a/target/classes/com/zky/zhyw/wxs/IndentureManageServlet.class and b/target/classes/com/zky/zhyw/wxs/IndentureManageServlet.class differ
diff --git a/web/config/config1/logs/SVSClient_system.log b/web/config/config1/logs/SVSClient_system.log
index 1ff89d0..f832a99 100644
--- a/web/config/config1/logs/SVSClient_system.log
+++ b/web/config/config1/logs/SVSClient_system.log
@@ -49,3 +49,5 @@ INFO [2023-12-11 17:02:26 465] Load HSM config IP1:10.10.3.2,Port1:8000
INFO [2023-12-11 17:02:30 617] BJCA Client Version:2.0 Build20210118
INFO [2023-12-11 17:04:48 758] Load HSM config IP1:10.10.3.2,Port1:8000
INFO [2023-12-11 17:04:48 962] BJCA Client Version:2.0 Build20210118
+INFO [2023-12-13 10:32:51 355] Load HSM config IP1:10.10.3.2,Port1:8000
+INFO [2023-12-13 10:32:51 533] BJCA Client Version:2.0 Build20210118
diff --git a/web/zhyw/smry/rydj/EmpByIdEdit.jsp b/web/zhyw/smry/rydj/EmpByIdEdit.jsp
index 9bafae1..22c9834 100644
--- a/web/zhyw/smry/rydj/EmpByIdEdit.jsp
+++ b/web/zhyw/smry/rydj/EmpByIdEdit.jsp
@@ -49,7 +49,8 @@
empid = buf.fget("empid ",pos);
empname = buf.fget("empname ",pos);
sj = buf.fget("frameworkid ",pos);
- birthday = Common.convertNull(buf.fget("birthday ",pos)).substring(0,10);
+ //birthday = Common.convertNull(buf.fget("birthday ",pos)).substring(0,10);
+ birthday = buf.fget("birthday ",pos);
sex = buf.fget("sex ",pos);
empcontaddr = buf.fget("empcontaddr ",pos);
empcontphone = buf.fget("empcontphone ",pos);
diff --git a/web/zhyw/smry/rydj/EmpEdit.jsp b/web/zhyw/smry/rydj/EmpEdit.jsp
index a5cce2b..c46a4fe 100644
--- a/web/zhyw/smry/rydj/EmpEdit.jsp
+++ b/web/zhyw/smry/rydj/EmpEdit.jsp
@@ -343,8 +343,8 @@ html {
if (!sex.equals("")) {
%>
+ form1.sex.value='<%=sex%>';
+
<%
}
} else {