From f8aafa0d07910a6d0d1ab10ec0ddad46988f9036 Mon Sep 17 00:00:00 2001
From: Chendy <596813911@qq.com>
Date: Fri, 1 Aug 2025 17:23:46 +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

---
 .../main/java/com/zdxt/domain/auth/Dept.java  | 220 ++++++++++
 .../java/com/zdxt/domain/auth/SzUser.java     | 400 ++++++++++++++++++
 .../main/java/com/zdxt/domain/auth/User.java  | 396 +++++++++++++++++
 .../system/dept/service/DeptServiceImpl.java  |  18 +
 .../system/user/service/UserServiceImpl.java  |   2 +
 .../resources/mapper/system/DeptMapper.xml    |  59 ++-
 .../resources/mapper/system/UserMapper.xml    | 145 ++++++-
 7 files changed, 1238 insertions(+), 2 deletions(-)
 create mode 100644 lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java

diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java
index c03d8765..11764653 100644
--- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java
@@ -140,6 +140,226 @@ public class Dept extends BaseDomain {
      */
     private Integer isTreeLeaf = 1;
 
+    /**
+     * 机构简称
+     */
+    private String simpleName;
+
+    /**
+     * 是否法定机构
+     */
+    private String isStatutoryOrg;
+
+    /**
+     * 是否生效
+     */
+    private String isActive;
+    /**
+     * 机构状态代码
+     */
+    private String unitStatusCode;
+    /**
+     * 机构状态
+     */
+    private String unitStatus;
+    /**
+     * 机构类型
+     */
+    private String unitType;
+    /**
+     * 行政区划代码
+     */
+    private String xzqhCode;
+    /**
+     * 行政区划
+     */
+    private String xzqh;
+    /**
+     * 是否参公管理
+     */
+    private String isCGManager;
+    /**
+     * 是否局（委）办
+     */
+    private String isBureauOffice;
+    /**
+     * 机构类型代码
+     */
+    private String unitTypeCode;
+    /**
+     * 机构类型代码
+     */
+    private String dwxzCode;
+    /**
+     * 单位性质
+     */
+    private String dwxz;
+    /**
+     * 系统单位类型编码
+     */
+    private String unitSysTypeCode;
+    /**
+     * 系统单位类型
+     */
+    private String unitSysType;
+    /**
+     * 单位系统类别描述
+     */
+    private String dwxtlbms;
+    /**
+     * 机构规格代码
+     */
+    private String unitLevelCode;
+
+    /**
+     * 机构规格
+     */
+    private String unitLevel;
+
+    public String getDwxz() {
+        return dwxz;
+    }
+
+    public void setDwxz(String dwxz) {
+        this.dwxz = dwxz;
+    }
+
+    public String getUnitSysTypeCode() {
+        return unitSysTypeCode;
+    }
+
+    public void setUnitSysTypeCode(String unitSysTypeCode) {
+        this.unitSysTypeCode = unitSysTypeCode;
+    }
+
+    public String getUnitSysType() {
+        return unitSysType;
+    }
+
+    public void setUnitSysType(String unitSysType) {
+        this.unitSysType = unitSysType;
+    }
+
+    public String getDwxtlbms() {
+        return dwxtlbms;
+    }
+
+    public void setDwxtlbms(String dwxtlbms) {
+        this.dwxtlbms = dwxtlbms;
+    }
+
+    public String getUnitLevelCode() {
+        return unitLevelCode;
+    }
+
+    public void setUnitLevelCode(String unitLevelCode) {
+        this.unitLevelCode = unitLevelCode;
+    }
+
+    public String getUnitLevel() {
+        return unitLevel;
+    }
+
+    public void setUnitLevel(String unitLevel) {
+        this.unitLevel = unitLevel;
+    }
+
+    public String getSimpleName() {
+        return simpleName;
+    }
+
+    public void setSimpleName(String simpleName) {
+        this.simpleName = simpleName;
+    }
+
+    public String getIsStatutoryOrg() {
+        return isStatutoryOrg;
+    }
+
+    public void setIsStatutoryOrg(String isStatutoryOrg) {
+        this.isStatutoryOrg = isStatutoryOrg;
+    }
+
+    public String getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(String isActive) {
+        this.isActive = isActive;
+    }
+
+    public String getUnitStatusCode() {
+        return unitStatusCode;
+    }
+
+    public void setUnitStatusCode(String unitStatusCode) {
+        this.unitStatusCode = unitStatusCode;
+    }
+
+    public String getUnitStatus() {
+        return unitStatus;
+    }
+
+    public void setUnitStatus(String unitStatus) {
+        this.unitStatus = unitStatus;
+    }
+
+    public String getUnitType() {
+        return unitType;
+    }
+
+    public void setUnitType(String unitType) {
+        this.unitType = unitType;
+    }
+
+    public String getXzqhCode() {
+        return xzqhCode;
+    }
+
+    public void setXzqhCode(String xzqhCode) {
+        this.xzqhCode = xzqhCode;
+    }
+
+    public String getXzqh() {
+        return xzqh;
+    }
+
+    public void setXzqh(String xzqh) {
+        this.xzqh = xzqh;
+    }
+
+    public String getIsCGManager() {
+        return isCGManager;
+    }
+
+    public void setIsCGManager(String isCGManager) {
+        this.isCGManager = isCGManager;
+    }
+
+    public String getIsBureauOffice() {
+        return isBureauOffice;
+    }
+
+    public void setIsBureauOffice(String isBureauOffice) {
+        this.isBureauOffice = isBureauOffice;
+    }
+
+    public String getUnitTypeCode() {
+        return unitTypeCode;
+    }
+
+    public void setUnitTypeCode(String unitTypeCode) {
+        this.unitTypeCode = unitTypeCode;
+    }
+
+    public String getDwxzCode() {
+        return dwxzCode;
+    }
+
+    public void setDwxzCode(String dwxzCode) {
+        this.dwxzCode = dwxzCode;
+    }
+
     public String getSystemId() {
         return systemId;
     }
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
new file mode 100644
index 00000000..188fb1c0
--- /dev/null
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/SzUser.java
@@ -0,0 +1,400 @@
+package com.zdxt.domain.auth;
+
+public class SzUser {
+
+    /** 英文名 */
+    private String engName;
+
+    /** 头像 */
+    private String photo;
+
+    /** 备用电话号码 */
+    private String spareNumber;
+
+    /** 座机号码 */
+    private String telephoneNumber;
+
+    /** 办公传真号码 */
+    private String faxNumber;
+
+    /** 性别代码 */
+    private String genderCode;
+
+    /** 排序号 */
+    private String sequence;
+
+    /** 管理单位 */
+    private String gldw;
+
+    /** 人员类别代码 */
+    private String rylbCode;
+
+    /** 人员类别 */
+    private String rylb;
+
+    /** 人员状态代码 */
+    private String ryztCode;
+
+    /** 人员状态 */
+    private String ryzt;
+
+    /** 是否单位主要领导 */
+    private String dwzyld;
+
+    /** 是否主持工作领导 */
+    private String zcgzld;
+
+    /** 职务名称 */
+    private String positionname;
+
+    /** 职务简称代码 */
+    private String zwjcCode;
+
+    /** 职务简称 */
+    private String zwjc;
+
+    /** 职务标识代码 */
+    private String zwbsCode;
+
+    /** 职务标识 */
+    private String zwbs;
+
+    /** 级别层级代码 */
+    private String jbccCode;
+
+    /** 级别层级 */
+    private String jbcc;
+
+    /** 所在省 */
+    private String province;
+
+    /** 所在市 */
+    private String city;
+
+    /** 所在区/县 */
+    private String district;
+
+    /** 籍贯代码 */
+    private String hometownCode;
+
+    /** 籍贯 */
+    private String hometown;
+
+    /** 聘用类型代码 */
+    private String pylxcode;
+
+    /** 聘用类型 */
+    private String pylx;
+
+    /** 合同开始日期 */
+    private String contractStartTime;
+
+    /** 合同结束日期 */
+    private String contractEndTime;
+
+    /** 管理责任人 */
+    private String glzrr;
+
+    /** 人员来源单位 */
+    private String rylydw;
+
+    /** 进入本单位方式代码 */
+    private String jrfscode;
+
+    /** 进入本单位方式 */
+    private String jrfs;
+
+    /** 政务微信手机号 */
+    private String zwwxMobile;
+
+    /** 市政务微信id */
+    private String zwwxid;
+
+    public String getEngName() {
+        return engName;
+    }
+
+    public void setEngName(String engName) {
+        this.engName = engName;
+    }
+
+    public String getPhoto() {
+        return photo;
+    }
+
+    public void setPhoto(String photo) {
+        this.photo = photo;
+    }
+
+    public String getSpareNumber() {
+        return spareNumber;
+    }
+
+    public void setSpareNumber(String spareNumber) {
+        this.spareNumber = spareNumber;
+    }
+
+    public String getTelephoneNumber() {
+        return telephoneNumber;
+    }
+
+    public void setTelephoneNumber(String telephoneNumber) {
+        this.telephoneNumber = telephoneNumber;
+    }
+
+    public String getFaxNumber() {
+        return faxNumber;
+    }
+
+    public void setFaxNumber(String faxNumber) {
+        this.faxNumber = faxNumber;
+    }
+
+    public String getGenderCode() {
+        return genderCode;
+    }
+
+    public void setGenderCode(String genderCode) {
+        this.genderCode = genderCode;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getGldw() {
+        return gldw;
+    }
+
+    public void setGldw(String gldw) {
+        this.gldw = gldw;
+    }
+
+    public String getRylbCode() {
+        return rylbCode;
+    }
+
+    public void setRylbCode(String rylbCode) {
+        this.rylbCode = rylbCode;
+    }
+
+    public String getRylb() {
+        return rylb;
+    }
+
+    public void setRylb(String rylb) {
+        this.rylb = rylb;
+    }
+
+    public String getRyztCode() {
+        return ryztCode;
+    }
+
+    public void setRyztCode(String ryztCode) {
+        this.ryztCode = ryztCode;
+    }
+
+    public String getRyzt() {
+        return ryzt;
+    }
+
+    public void setRyzt(String ryzt) {
+        this.ryzt = ryzt;
+    }
+
+    public String getDwzyld() {
+        return dwzyld;
+    }
+
+    public void setDwzyld(String dwzyld) {
+        this.dwzyld = dwzyld;
+    }
+
+    public String getZcgzld() {
+        return zcgzld;
+    }
+
+    public void setZcgzld(String zcgzld) {
+        this.zcgzld = zcgzld;
+    }
+
+    public String getPositionname() {
+        return positionname;
+    }
+
+    public void setPositionname(String positionname) {
+        this.positionname = positionname;
+    }
+
+    public String getZwjcCode() {
+        return zwjcCode;
+    }
+
+    public void setZwjcCode(String zwjcCode) {
+        this.zwjcCode = zwjcCode;
+    }
+
+    public String getZwjc() {
+        return zwjc;
+    }
+
+    public void setZwjc(String zwjc) {
+        this.zwjc = zwjc;
+    }
+
+    public String getZwbsCode() {
+        return zwbsCode;
+    }
+
+    public void setZwbsCode(String zwbsCode) {
+        this.zwbsCode = zwbsCode;
+    }
+
+    public String getZwbs() {
+        return zwbs;
+    }
+
+    public void setZwbs(String zwbs) {
+        this.zwbs = zwbs;
+    }
+
+    public String getJbccCode() {
+        return jbccCode;
+    }
+
+    public void setJbccCode(String jbccCode) {
+        this.jbccCode = jbccCode;
+    }
+
+    public String getJbcc() {
+        return jbcc;
+    }
+
+    public void setJbcc(String jbcc) {
+        this.jbcc = jbcc;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getHometownCode() {
+        return hometownCode;
+    }
+
+    public void setHometownCode(String hometownCode) {
+        this.hometownCode = hometownCode;
+    }
+
+    public String getHometown() {
+        return hometown;
+    }
+
+    public void setHometown(String hometown) {
+        this.hometown = hometown;
+    }
+
+    public String getPylxcode() {
+        return pylxcode;
+    }
+
+    public void setPylxcode(String pylxcode) {
+        this.pylxcode = pylxcode;
+    }
+
+    public String getPylx() {
+        return pylx;
+    }
+
+    public void setPylx(String pylx) {
+        this.pylx = pylx;
+    }
+
+    public String getContractStartTime() {
+        return contractStartTime;
+    }
+
+    public void setContractStartTime(String contractStartTime) {
+        this.contractStartTime = contractStartTime;
+    }
+
+    public String getContractEndTime() {
+        return contractEndTime;
+    }
+
+    public void setContractEndTime(String contractEndTime) {
+        this.contractEndTime = contractEndTime;
+    }
+
+    public String getGlzrr() {
+        return glzrr;
+    }
+
+    public void setGlzrr(String glzrr) {
+        this.glzrr = glzrr;
+    }
+
+    public String getRylydw() {
+        return rylydw;
+    }
+
+    public void setRylydw(String rylydw) {
+        this.rylydw = rylydw;
+    }
+
+    public String getJrfscode() {
+        return jrfscode;
+    }
+
+    public void setJrfscode(String jrfscode) {
+        this.jrfscode = jrfscode;
+    }
+
+    public String getJrfs() {
+        return jrfs;
+    }
+
+    public void setJrfs(String jrfs) {
+        this.jrfs = jrfs;
+    }
+
+    public String getZwwxMobile() {
+        return zwwxMobile;
+    }
+
+    public void setZwwxMobile(String zwwxMobile) {
+        this.zwwxMobile = zwwxMobile;
+    }
+
+    public String getZwwxid() {
+        return 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 c76fd4ea..189b8c9b 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
@@ -216,6 +216,402 @@ public class User extends BaseDomain {
 
     private Integer isShowCardId;
 
+    /** 英文名 */
+    private String engName;
+
+    /** 头像 */
+    private String photo;
+
+    /** 备用电话号码 */
+    private String spareNumber;
+
+    /** 座机号码 */
+    private String telephoneNumber;
+
+    /** 办公传真号码 */
+    private String faxNumber;
+
+    /** 性别代码 */
+    private String genderCode;
+
+    /** 排序号 */
+    private String sequence;
+
+    /** 管理单位 */
+    private String gldw;
+
+    /** 人员类别代码 */
+    private String rylbCode;
+
+    /** 人员类别 */
+    private String rylb;
+
+    /** 人员状态代码 */
+    private String ryztCode;
+
+    /** 人员状态 */
+    private String ryzt;
+
+    /** 是否单位主要领导 */
+    private String dwzyld;
+
+    /** 是否主持工作领导 */
+    private String zcgzld;
+
+    /** 职务名称 */
+    private String positionname;
+
+    /** 职务简称代码 */
+    private String zwjcCode;
+
+    /** 职务简称 */
+    private String zwjc;
+
+    /** 职务标识代码 */
+    private String zwbsCode;
+
+    /** 职务标识 */
+    private String zwbs;
+
+    /** 级别层级代码 */
+    private String jbccCode;
+
+    /** 级别层级 */
+    private String jbcc;
+
+    /** 所在省 */
+    private String province;
+
+    /** 所在市 */
+    private String city;
+
+    /** 所在区/县 */
+    private String district;
+
+    /** 籍贯代码 */
+    private String hometownCode;
+
+    /** 籍贯 */
+    private String hometown;
+
+    /** 聘用类型代码 */
+    private String pylxcode;
+
+    /** 聘用类型 */
+    private String pylx;
+
+    /** 合同开始日期 */
+    private String contractStartTime;
+
+    /** 合同结束日期 */
+    private String contractEndTime;
+
+    /** 管理责任人 */
+    private String glzrr;
+
+    /** 人员来源单位 */
+    private String rylydw;
+
+    /** 进入本单位方式代码 */
+    private String jrfscode;
+
+    /** 进入本单位方式 */
+    private String jrfs;
+
+    /** 政务微信手机号 */
+    private String zwwxMobile;
+
+    /** 市政务微信id */
+    private String zwwxid;
+
+    public String getEngName() {
+        return engName;
+    }
+
+    public void setEngName(String engName) {
+        this.engName = engName;
+    }
+
+    public String getPhoto() {
+        return photo;
+    }
+
+    public void setPhoto(String photo) {
+        this.photo = photo;
+    }
+
+    public String getSpareNumber() {
+        return spareNumber;
+    }
+
+    public void setSpareNumber(String spareNumber) {
+        this.spareNumber = spareNumber;
+    }
+
+    public String getTelephoneNumber() {
+        return telephoneNumber;
+    }
+
+    public void setTelephoneNumber(String telephoneNumber) {
+        this.telephoneNumber = telephoneNumber;
+    }
+
+    public String getFaxNumber() {
+        return faxNumber;
+    }
+
+    public void setFaxNumber(String faxNumber) {
+        this.faxNumber = faxNumber;
+    }
+
+    public String getGenderCode() {
+        return genderCode;
+    }
+
+    public void setGenderCode(String genderCode) {
+        this.genderCode = genderCode;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getGldw() {
+        return gldw;
+    }
+
+    public void setGldw(String gldw) {
+        this.gldw = gldw;
+    }
+
+    public String getRylbCode() {
+        return rylbCode;
+    }
+
+    public void setRylbCode(String rylbCode) {
+        this.rylbCode = rylbCode;
+    }
+
+    public String getRylb() {
+        return rylb;
+    }
+
+    public void setRylb(String rylb) {
+        this.rylb = rylb;
+    }
+
+    public String getRyztCode() {
+        return ryztCode;
+    }
+
+    public void setRyztCode(String ryztCode) {
+        this.ryztCode = ryztCode;
+    }
+
+    public String getRyzt() {
+        return ryzt;
+    }
+
+    public void setRyzt(String ryzt) {
+        this.ryzt = ryzt;
+    }
+
+    public String getDwzyld() {
+        return dwzyld;
+    }
+
+    public void setDwzyld(String dwzyld) {
+        this.dwzyld = dwzyld;
+    }
+
+    public String getZcgzld() {
+        return zcgzld;
+    }
+
+    public void setZcgzld(String zcgzld) {
+        this.zcgzld = zcgzld;
+    }
+
+    public String getPositionname() {
+        return positionname;
+    }
+
+    public void setPositionname(String positionname) {
+        this.positionname = positionname;
+    }
+
+    public String getZwjcCode() {
+        return zwjcCode;
+    }
+
+    public void setZwjcCode(String zwjcCode) {
+        this.zwjcCode = zwjcCode;
+    }
+
+    public String getZwjc() {
+        return zwjc;
+    }
+
+    public void setZwjc(String zwjc) {
+        this.zwjc = zwjc;
+    }
+
+    public String getZwbsCode() {
+        return zwbsCode;
+    }
+
+    public void setZwbsCode(String zwbsCode) {
+        this.zwbsCode = zwbsCode;
+    }
+
+    public String getZwbs() {
+        return zwbs;
+    }
+
+    public void setZwbs(String zwbs) {
+        this.zwbs = zwbs;
+    }
+
+    public String getJbccCode() {
+        return jbccCode;
+    }
+
+    public void setJbccCode(String jbccCode) {
+        this.jbccCode = jbccCode;
+    }
+
+    public String getJbcc() {
+        return jbcc;
+    }
+
+    public void setJbcc(String jbcc) {
+        this.jbcc = jbcc;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getHometownCode() {
+        return hometownCode;
+    }
+
+    public void setHometownCode(String hometownCode) {
+        this.hometownCode = hometownCode;
+    }
+
+    public String getHometown() {
+        return hometown;
+    }
+
+    public void setHometown(String hometown) {
+        this.hometown = hometown;
+    }
+
+    public String getPylxcode() {
+        return pylxcode;
+    }
+
+    public void setPylxcode(String pylxcode) {
+        this.pylxcode = pylxcode;
+    }
+
+    public String getPylx() {
+        return pylx;
+    }
+
+    public void setPylx(String pylx) {
+        this.pylx = pylx;
+    }
+
+    public String getContractStartTime() {
+        return contractStartTime;
+    }
+
+    public void setContractStartTime(String contractStartTime) {
+        this.contractStartTime = contractStartTime;
+    }
+
+    public String getContractEndTime() {
+        return contractEndTime;
+    }
+
+    public void setContractEndTime(String contractEndTime) {
+        this.contractEndTime = contractEndTime;
+    }
+
+    public String getGlzrr() {
+        return glzrr;
+    }
+
+    public void setGlzrr(String glzrr) {
+        this.glzrr = glzrr;
+    }
+
+    public String getRylydw() {
+        return rylydw;
+    }
+
+    public void setRylydw(String rylydw) {
+        this.rylydw = rylydw;
+    }
+
+    public String getJrfscode() {
+        return jrfscode;
+    }
+
+    public void setJrfscode(String jrfscode) {
+        this.jrfscode = jrfscode;
+    }
+
+    public String getJrfs() {
+        return jrfs;
+    }
+
+    public void setJrfs(String jrfs) {
+        this.jrfs = jrfs;
+    }
+
+    public String getZwwxMobile() {
+        return zwwxMobile;
+    }
+
+    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/dept/service/DeptServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
index ce8abebf..652024e7 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
@@ -574,6 +574,24 @@ public class DeptServiceImpl implements IDeptService
             dept.setTaskId(jsonObject.getString("taskId"));
             dept.setSystemId(jsonObject.getString("systemId"));
             dept.setCreditcode(jsonObject.getString("creditcode"));
+            dept.setSimpleName(jsonObject.getString("simpleName"));
+            dept.setIsStatutoryOrg(jsonObject.getString("isStatutoryOrg"));
+            dept.setIsActive(jsonObject.getString("isActive"));
+            dept.setUnitStatusCode(jsonObject.getString("unitStatusCode"));
+            dept.setUnitStatus(jsonObject.getString("unitStatus"));
+            dept.setUnitType(jsonObject.getString("unitType"));
+            dept.setXzqh(jsonObject.getString("xzqh"));
+            dept.setXzqhCode(jsonObject.getString("xzqhCode"));
+            dept.setIsCGManager(jsonObject.getString("isCGManager"));
+            dept.setIsBureauOffice(jsonObject.getString("isBureauOffice"));
+            dept.setUnitTypeCode(jsonObject.getString("unitTypeCode"));
+            dept.setDwxzCode(jsonObject.getString("dwxzCode"));
+            dept.setDwxz(jsonObject.getString("dwxz"));
+            dept.setUnitSysType(jsonObject.getString("unitSysType"));
+            dept.setUnitSysTypeCode(jsonObject.getString("unitSysTypeCode"));
+            dept.setDwxtlbms(jsonObject.getString("dwxtlbms"));
+            dept.setUnitLevel(jsonObject.getString("unitLevel"));
+            dept.setUnitLevelCode(jsonObject.getString("unitLevelCode"));
 
             Dept uniqueDept = deptMapper.selectDeptByOrganizationId(jsonObject.getString("organizationId"));
             if (null != uniqueDept && uniqueDept.getOrganizationId() != null) {
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 dd0220cd..0b001442 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
@@ -725,7 +725,9 @@ public class UserServiceImpl implements IUserService {
                     e.printStackTrace();
                 }
 
+                SzUser temp=JSONObject.parseObject(jsonObject.toString(),SzUser.class);
                 User user = new User();
+                BeanUtil.copyProperties(temp,user);
                 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/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
index edba72af..feb27cfe 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
@@ -46,12 +46,33 @@
         <result property="taskId" column="taskId"/>
         <result property="creditcode" column="creditcode"/>
         <result property="zone" column="zone"/>
+        <result property="simpleName"    column="simpleName"    />
+        <result property="isStatutoryOrg"    column="isStatutoryOrg"    />
+        <result property="isActive"    column="isActive"    />
+        <result property="unitStatusCode"    column="unitStatusCode"    />
+        <result property="unitStatus"    column="unitStatus"    />
+        <result property="unitType"    column="unitType"    />
+        <result property="xzqhCode"    column="xzqhCode"    />
+        <result property="xzqh"    column="xzqh"    />
+        <result property="isCGManager"    column="isCGManager"    />
+        <result property="isBureauOffice"    column="isBureauOffice"    />
+        <result property="unitTypeCode"    column="unitTypeCode"    />
+        <result property="dwxzCode"    column="dwxzCode"    />
+        <result property="dwxz"    column="dwxz"    />
+        <result property="unitSysTypeCode"    column="unitSysTypeCode"    />
+        <result property="unitSysType"    column="unitSysType"    />
+        <result property="dwxtlbms"    column="dwxtlbms"    />
+        <result property="unitLevelCode"    column="unitLevelCode"    />
+        <result property="unitLevel"    column="unitLevel"    />
     </resultMap>
 
     <sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,dept_type,d.kingdee_org_id,d.kingdee_org_parent_id,
        tenant_code, organizationId, organizationParentId, zzLevel, code, mappingUnitParentId,updateAt, createAt, description, effectOn, sequence, isDeleted, zzDisplayPath, `name`, guid, zzIsLeaf, isDisabled,
-       fullname, isMappingUnit, srzUnitId, taskId,creditcode,zone from sys_dept d
+       fullname, isMappingUnit, srzUnitId, taskId,creditcode,zone,simpleName, isStatutoryOrg, isActive, unitStatusCode, unitStatus, unitType, xzqhCode,
+           xzqh, isCGManager, isBureauOffice, unitTypeCode, dwxzCode, dwxz, unitSysTypeCode, unitSysType, dwxtlbms,
+            unitLevelCode,unitLevel
+        from sys_dept d
     </sql>
 
     <select id="selectDeptAll" resultMap="DeptResult">
@@ -331,6 +352,24 @@
         <if test="systemId != null and systemId != ''">systemId,</if>
         <if test="creditcode != null and creditcode != ''">creditcode,</if>
         <if test="zone != null">zone,</if>
+        <if test="simpleName != null  and simpleName != ''">simpleName,</if>
+        <if test="isStatutoryOrg != null ">isStatutoryOrg,</if>
+        <if test="isActive != null ">isActive,</if>
+        <if test="unitStatusCode != null  and unitStatusCode != ''">unitStatusCode,</if>
+        <if test="unitStatus != null  and unitStatus != ''">unitStatus,</if>
+        <if test="unitType != null  and unitType != ''">unitType,</if>
+        <if test="xzqhCode != null  and xzqhCode != ''">xzqhCode,</if>
+        <if test="xzqh != null  and xzqh != ''">xzqh,</if>
+        <if test="isCGManager != null ">isCGManager,</if>
+        <if test="isBureauOffice != null ">isBureauOffice,</if>
+        <if test="unitTypeCode != null  and unitTypeCode != ''">unitTypeCode,</if>
+        <if test="dwxzCode != null  and dwxzCode != ''">dwxzCode,</if>
+        <if test="dwxz != null  and dwxz != ''">dwxz,</if>
+        <if test="unitSysTypeCode != null  and unitSysTypeCode != ''">unitSysTypeCode,</if>
+        <if test="unitSysType != null  and unitSysType != ''">unitSysType,</if>
+        <if test="dwxtlbms != null  and dwxtlbms != ''">dwxtlbms,</if>
+        <if test="unitLevelCode != null  and unitLevelCode != ''">unitLevelCode,</if>
+        <if test="unitLevel != null  and unitLevel != ''">unitLevel,</if>
         create_time
         )values(
         <if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -369,6 +408,24 @@
         <if test="systemId != null and systemId != ''">#{systemId},</if>
         <if test="creditcode != null and creditcode != ''">#{creditcode},</if>
         <if test="zone != null">#{zone},</if>
+        <if test="simpleName != null  and simpleName != ''">#{simpleName},</if>
+        <if test="isStatutoryOrg != null ">#{isStatutoryOrg},</if>
+        <if test="isActive != null ">#{isActive},</if>
+        <if test="unitStatusCode != null  and unitStatusCode != ''">#{unitStatusCode},</if>
+        <if test="unitStatus != null  and unitStatus != ''">#{unitStatus},</if>
+        <if test="unitType != null  and unitType != ''">#{unitType},</if>
+        <if test="xzqhCode != null  and xzqhCode != ''">#{xzqhCode},</if>
+        <if test="xzqh != null  and xzqh != ''">#{xzqh},</if>
+        <if test="isCGManager != null ">#{iscgmanager},</if>
+        <if test="isBureauOffice != null ">#{isBureauOffice},</if>
+        <if test="unitTypeCode != null  and unitTypeCode != ''">#{unitTypeCode},</if>
+        <if test="dwxzCode != null  and dwxzCode != ''">#{dwxzCode},</if>
+        <if test="dwxz != null  and dwxz != ''">#{dwxz},</if>
+        <if test="unitSysTypeCode != null  and unitSysTypeCode != ''">#{unitSysTypeCode},</if>
+        <if test="unitSysType != null  and unitSysType != ''">#{unitSysType},</if>
+        <if test="dwxtlbms != null  and dwxtlbms != ''">#{dwxtlbms},</if>
+        <if test="unitLevelCode != null  and unitLevelCode != ''">#{unitLevelCode},</if>
+        <if test="unitLevel != null  and unitLevel != ''">#{unitLevel},</if>
         sysdate()
         )
     </insert>
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 8f42bb47..14b3020c 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -47,10 +47,45 @@
         <result property="units" column="units"/>
         <result property="strUserId" column="strUserId"/>
         <result property="userSource" column="user_source"/>
+        <result property="engName"    column="engName"    />
+        <result property="photo"    column="photo"    />
+        <result property="spareNumber"    column="spareNumber"    />
+        <result property="telephoneNumber"    column="telephoneNumber"    />
+        <result property="faxNumber"    column="faxNumber"    />
+        <result property="gendercode"    column="genderCode"    />
+        <result property="sequence"    column="sequence"    />
+        <result property="gldw"    column="gldw"    />
+        <result property="rylbCode"    column="rylbCode"    />
+        <result property="rylb"    column="rylb"    />
+        <result property="ryztCode"    column="ryztCode"    />
+        <result property="ryzt"    column="ryzt"    />
+        <result property="dwzyld"    column="dwzyld"    />
+        <result property="zcgzld"    column="zcgzld"    />
+        <result property="positionname"    column="positionname"    />
+        <result property="zwjcCode"    column="zwjcCode"    />
+        <result property="zwjc"    column="zwjc"    />
+        <result property="zwbsCode"    column="zwbsCode"    />
+        <result property="zwbs"    column="zwbs"    />
+        <result property="jbccCode"    column="jbccCode"    />
+        <result property="jbcc"    column="jbcc"    />
+        <result property="province"    column="province"    />
+        <result property="city"    column="city"    />
+        <result property="district"    column="district"    />
+        <result property="hometownCode"    column="hometownCode"    />
+        <result property="hometown"    column="hometown"    />
+        <result property="pylxcode"    column="pylxcode"    />
+        <result property="pylx"    column="pylx"    />
+        <result property="contractStartTime"    column="contractStartTime"    />
+        <result property="contractEndTime"    column="contractEndTime"    />
+        <result property="glzrr"    column="glzrr"    />
+        <result property="rylydw"    column="rylydw"    />
+        <result property="jrfscode"    column="jrfscode"    />
+        <result property="jrfs"    column="jrfs"    />
+        <result property="zwwxMobile"    column="zwwxMobile"    />
+        <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"/>
-
     </resultMap>
 
     <resultMap id="deptResult" type="Dept">
@@ -509,6 +544,42 @@
             <if test="strUserId != null and strUserId != ''">strUserId = #{strUserId},</if>
             <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson = #{isMappingPerson},</if>
             <if test="units != null and units != ''">units = #{units},</if>
+            <if test="engName != null  and engName != ''">engName = #{engName},</if>
+            <if test="photo != null  and photo != ''">photo = #{photo},</if>
+            <if test="spareNumber != null  and spareNumber != ''">spareNumber = #{spareNumber},</if>
+            <if test="telephoneNumber != null  and telephoneNumber != ''">telephoneNumber = #{telephoneNumber},</if>
+            <if test="faxNumber != null  and faxNumber != ''">faxNumber = #{faxNumber},</if>
+            <if test="genderCode != null  and genderCode != ''">genderCode = #{genderCode},</if>
+            <if test="sequence != null  and sequence != ''">sequence = #{sequence},</if>
+            <if test="gldw != null  and gldw != ''">gldw = #{gldw},</if>
+            <if test="rylbCode != null  and rylbCode != ''">rylbCode = #{rylbCode},</if>
+            <if test="rylb != null  and rylb != ''">rylb = #{rylb},</if>
+            <if test="ryztCode != null  and ryztCode != ''">ryztCode = #{ryztCode},</if>
+            <if test="ryzt != null  and ryzt != ''">ryzt = #{ryzt},</if>
+            <if test="dwzyld != null  and dwzyld != ''">dwzyld = #{dwzyld},</if>
+            <if test="zcgzld != null  and zcgzld != ''">zcgzld = #{zcgzld},</if>
+            <if test="positionname != null  and positionname != ''">positionname = #{positionname},</if>
+            <if test="zwjcCode != null  and zwjcCode != ''">zwjcCode = #{zwjcCode},</if>
+            <if test="zwjc != null  and zwjc != ''">zwjc = #{zwjc},</if>
+            <if test="zwbsCode != null  and zwbsCode != ''">zwbsCode = #{zwbsCode},</if>
+            <if test="zwbs != null  and zwbs != ''">zwbs = #{zwbs},</if>
+            <if test="jbccCode != null  and jbccCode != ''">jbccCode = #{jbccCode},</if>
+            <if test="jbcc != null  and jbcc != ''">jbcc = #{jbcc},</if>
+            <if test="province != null  and province != ''">province = #{province},</if>
+            <if test="city != null  and city != ''">city = #{city},</if>
+            <if test="district != null  and district != ''">district = #{district},</if>
+            <if test="hometownCode != null  and hometownCode != ''">hometownCode = #{hometownCode},</if>
+            <if test="hometown != null  and hometown != ''">hometown = #{hometown},</if>
+            <if test="pylxcode != null  and pylxcode != ''">pylxcode = #{pylxcode},</if>
+            <if test="pylx != null  and pylx != ''">pylx = #{pylx},</if>
+            <if test="contractStartTime != null  and contractStartTime != ''">contractStartTime = #{contractStartTime},</if>
+            <if test="contractEndTime != null  and contractEndTime != ''">contractEndTime = #{contractEndTime},</if>
+            <if test="glzrr != null  and glzrr != ''">glzrr = #{glzrr},</if>
+            <if test="rylydw != null  and rylydw != ''">rylydw = #{rylydw},</if>
+            <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>
             update_time = sysdate()
         </set>
         where user_id = #{userId}
@@ -579,6 +650,42 @@
         <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson,</if>
         <if test="units != null and units != ''">units,</if>
         <if test="userSource != null ">user_source,</if>
+        <if test="engName != null  and engName != ''">engName,</if>
+        <if test="photo != null  and photo != ''">photo,</if>
+        <if test="spareNumber != null  and spareNumber != ''">spareNumber,</if>
+        <if test="telephoneNumber != null  and telephoneNumber != ''">telephoneNumber,</if>
+        <if test="faxNumber != null  and faxNumber != ''">faxNumber,</if>
+        <if test="genderCode != null  and genderCode != ''">genderCode,</if>
+        <if test="sequence != null  and sequence != ''">sequence,</if>
+        <if test="gldw != null  and gldw != ''">gldw,</if>
+        <if test="rylbCode != null  and rylbCode != ''">rylbCode,</if>
+        <if test="rylb != null  and rylb != ''">rylb,</if>
+        <if test="ryztCode != null  and ryztCode != ''">ryztCode,</if>
+        <if test="ryzt != null  and ryzt != ''">ryzt,</if>
+        <if test="dwzyld != null  and dwzyld != ''">dwzyld,</if>
+        <if test="zcgzld != null  and zcgzld != ''">zcgzld,</if>
+        <if test="positionname != null  and positionname != ''">positionname,</if>
+        <if test="zwjcCode != null  and zwjcCode != ''">zwjcCode,</if>
+        <if test="zwjc != null  and zwjc != ''">zwjc,</if>
+        <if test="zwbsCode != null  and zwbsCode != ''">zwbsCode,</if>
+        <if test="zwbs != null  and zwbs != ''">zwbs,</if>
+        <if test="jbccCode != null  and jbccCode != ''">jbccCode,</if>
+        <if test="jbcc != null  and jbcc != ''">jbcc,</if>
+        <if test="province != null  and province != ''">province,</if>
+        <if test="city != null  and city != ''">city,</if>
+        <if test="district != null  and district != ''">district,</if>
+        <if test="hometownCode != null  and hometownCode != ''">hometownCode,</if>
+        <if test="hometown != null  and hometown != ''">hometown,</if>
+        <if test="pylxcode != null  and pylxcode != ''">pylxcode,</if>
+        <if test="pylx != null  and pylx != ''">pylx,</if>
+        <if test="contractStartTime != null  and contractStartTime != ''">contractStartTime,</if>
+        <if test="contractEndTime != null  and contractEndTime != ''">contractEndTime,</if>
+        <if test="glzrr != null  and glzrr != ''">glzrr,</if>
+        <if test="rylydw != null  and rylydw != ''">rylydw,</if>
+        <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>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -618,6 +725,42 @@
         <if test="isMappingPerson != null and isMappingPerson != ''">#{isMappingPerson},</if>
         <if test="units != null and units != ''">#{units},</if>
         <if test="userSource != null ">#{userSource},</if>
+        <if test="engName != null  and engName != ''">#{engName},</if>
+        <if test="photo != null  and photo != ''">#{photo},</if>
+        <if test="spareNumber != null  and spareNumber != ''">#{spareNumber},</if>
+        <if test="telephoneNumber != null  and telephoneNumber != ''">#{telephoneNumber},</if>
+        <if test="faxNumber != null  and faxNumber != ''">#{faxNumber},</if>
+        <if test="genderCode != null  and genderCode != ''">#{genderCode},</if>
+        <if test="sequence != null  and sequence != ''">#{sequence},</if>
+        <if test="gldw != null  and gldw != ''">#{gldw},</if>
+        <if test="rylbCode != null  and rylbCode != ''">#{rylbCode},</if>
+        <if test="rylb != null  and rylb != ''">#{rylb},</if>
+        <if test="ryztCode != null  and ryztCode != ''">#{ryztCode},</if>
+        <if test="ryzt != null  and ryzt != ''">#{ryzt},</if>
+        <if test="dwzyld != null  and dwzyld != ''">#{dwzyld},</if>
+        <if test="zcgzld != null  and zcgzld != ''">#{zcgzld},</if>
+        <if test="positionname != null  and positionname != ''">#{positionname},</if>
+        <if test="zwjcCode != null  and zwjcCode != ''">#{zwjcCode},</if>
+        <if test="zwjc != null  and zwjc != ''">#{zwjc},</if>
+        <if test="zwbsCode != null  and zwbsCode != ''">#{zwbsCode},</if>
+        <if test="zwbs != null  and zwbs != ''">#{zwbs},</if>
+        <if test="zwbsCode != null  and zwbsCode != ''">#{zwbsCode},</if>
+        <if test="jbcc != null  and jbcc != ''">#{jbcc},</if>
+        <if test="province != null  and province != ''">#{province},</if>
+        <if test="city != null  and city != ''">#{city},</if>
+        <if test="district != null  and district != ''">#{district},</if>
+        <if test="hometownCode != null  and hometownCode != ''">#{hometownCode},</if>
+        <if test="hometown != null  and hometown != ''">#{hometown},</if>
+        <if test="pylxcode != null  and pylxcode != ''">#{pylxcode},</if>
+        <if test="pylx != null  and pylx != ''">#{pylx},</if>
+        <if test="contractStartTime != null  and contractStartTime != ''">#{contractStartTime},</if>
+        <if test="contractEndTime != null  and contractEndTime != ''">#{contractEndTime},</if>
+        <if test="glzrr != null  and glzrr != ''">#{glzrr},</if>
+        <if test="rylydw != null  and rylydw != ''">#{rylydw},</if>
+        <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>
         sysdate()
         )
     </insert>