新增市认证对接字段

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;
     }
 }

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;
     }

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"));

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -82,7 +82,7 @@
         <result property="jrfscode"    column="jrfscode"    />
         <result property="jrfs"    column="jrfs"    />
         <result property="zwwxMobile"    column="zwwxMobile"    />
-        <result property="zwwxid"    column="zwwxid"    />
+        <result property="zwwxId"    column="zwwxId"    />
         <association property="dept" column="dept_id" javaType="Dept" resultMap="deptResult"/>
         <association property="tenant" column="tenant_code" javaType="SysTenant" resultMap="tenantResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -579,7 +579,7 @@
             <if test="jrfscode != null  and jrfscode != ''">jrfscode = #{jrfscode},</if>
             <if test="jrfs != null  and jrfs != ''">jrfs = #{jrfs},</if>
             <if test="zwwxMobile != null  and zwwxMobile != ''">zwwxMobile = #{zwwxMobile},</if>
-            <if test="zwwxid != null  and zwwxid != ''">zwwxid = #{zwwxid},</if>
+            <if test="zwwxId != null  and zwwxId != ''">zwwxId = #{zwwxId},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
@@ -685,7 +685,7 @@
         <if test="jrfscode != null  and jrfscode != ''">jrfscode,</if>
         <if test="jrfs != null  and jrfs != ''">jrfs,</if>
         <if test="zwwxMobile != null  and zwwxMobile != ''">zwwxMobile,</if>
-        <if test="zwwxid != null  and zwwxid != ''">zwwxid,</if>
+        <if test="zwwxId != null  and zwwxId != ''">zwwxId,</if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -760,7 +760,7 @@
         <if test="jrfscode != null  and jrfscode != ''">#{jrfscode},</if>
         <if test="jrfs != null  and jrfs != ''">#{jrfs},</if>
         <if test="zwwxMobile != null  and zwwxMobile != ''">#{zwwxMobile},</if>
-        <if test="zwwxid != null  and zwwxid != ''">#{zwwxid},</if>
+        <if test="zwwxId != null  and zwwxId != ''">#{zwwxId},</if>
         sysdate()
         )
     </insert>