From 3057097029a2bb814c3b9fd025c47847f9c708f1 Mon Sep 17 00:00:00 2001
From: Chendy <596813911@qq.com>
Date: Tue, 5 Aug 2025 15:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=82=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/zdxt/domain/auth/SzUser.java | 21 ++++++++++----
.../main/java/com/zdxt/domain/auth/User.java | 29 ++++++++++++-------
.../system/user/service/UserServiceImpl.java | 1 +
.../resources/mapper/system/UserMapper.xml | 8 ++---
4 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java
index 188fb1c0..45f11ab7 100644
--- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java
@@ -108,7 +108,18 @@ public class SzUser {
private String zwwxMobile;
/** 市政务微信id */
- private String zwwxid;
+ private String zwwxId;
+
+ private String gender;
+
+
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
public String getEngName() {
return engName;
@@ -390,11 +401,11 @@ public class SzUser {
this.zwwxMobile = zwwxMobile;
}
- public String getZwwxid() {
- return zwwxid;
+ public String getZwwxId() {
+ return zwwxId;
}
- public void setZwwxid(String zwwxid) {
- this.zwwxid = zwwxid;
+ public void setZwwxId(String zwwxId) {
+ this.zwwxId = zwwxId;
}
}
diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
index 189b8c9b..7d576b17 100644
--- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
@@ -322,7 +322,25 @@ public class User extends BaseDomain {
private String zwwxMobile;
/** 市政务微信id */
- private String zwwxid;
+ private String zwwxId;
+
+ private String gender;
+
+ public String getZwwxId() {
+ return zwwxId;
+ }
+
+ public void setZwwxId(String zwwxId) {
+ this.zwwxId = zwwxId;
+ }
+
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
public String getEngName() {
return engName;
@@ -603,15 +621,6 @@ public class User extends BaseDomain {
public void setZwwxMobile(String zwwxMobile) {
this.zwwxMobile = zwwxMobile;
}
-
- public String getZwwxid() {
- return zwwxid;
- }
-
- public void setZwwxid(String zwwxid) {
- this.zwwxid = zwwxid;
- }
-
public String getNotUserId() {
return notUserId;
}
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
index 0b001442..ccedcee6 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
@@ -728,6 +728,7 @@ public class UserServiceImpl implements IUserService {
SzUser temp=JSONObject.parseObject(jsonObject.toString(),SzUser.class);
User user = new User();
BeanUtil.copyProperties(temp,user);
+ user.setSex(user.getGenderCode());
user.setDeptId(jsonObject.getString("organizationId"));
user.setOrganizationId(jsonObject.getString("organizationId"));
user.setStrUserId(jsonObject.getString("userId"));
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 14b3020c..9685c662 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -82,7 +82,7 @@
-
+
@@ -579,7 +579,7 @@
jrfscode = #{jrfscode},
jrfs = #{jrfs},
zwwxMobile = #{zwwxMobile},
- zwwxid = #{zwwxid},
+ zwwxId = #{zwwxId},
update_time = sysdate()
where user_id = #{userId}
@@ -685,7 +685,7 @@
jrfscode,
jrfs,
zwwxMobile,
- zwwxid,
+ zwwxId,
create_time
)values(
#{userId},
@@ -760,7 +760,7 @@
#{jrfscode},
#{jrfs},
#{zwwxMobile},
- #{zwwxid},
+ #{zwwxId},
sysdate()
)