深圳易用户登录

lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Dept.java

@@ -107,16 +107,34 @@ public class Dept extends BaseDomain {
     private String description;
     private String effectOn;
     private String sequence;
-    private Integer isDeleted;
+    private String isDeleted;
+    private String isDisabled;
     private String zzDisplayPath;
     private String name;
     private String guid;
     private String zzIsLeaf;
-    private Integer isDisabled;
     private String fullname;
     private String isMappingUnit;
     private String srzUnitId;
     private String taskId;
+    private String systemId;
+    private String creditcode;
+
+    public String getSystemId() {
+        return systemId;
+    }
+
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+
+    public String getCreditcode() {
+        return creditcode;
+    }
+
+    public void setCreditcode(String creditcode) {
+        this.creditcode = creditcode;
+    }
 
     public String getOrganizationParentId() {
         return organizationParentId;
@@ -190,11 +208,11 @@ public class Dept extends BaseDomain {
         this.sequence = sequence;
     }
 
-    public Integer getIsDeleted() {
+    public String getIsDeleted() {
         return isDeleted;
     }
 
-    public void setIsDeleted(Integer isDeleted) {
+    public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
 
@@ -230,11 +248,11 @@ public class Dept extends BaseDomain {
         this.zzIsLeaf = zzIsLeaf;
     }
 
-    public Integer getIsDisabled() {
+    public String getIsDisabled() {
         return isDisabled;
     }
 
-    public void setIsDisabled(Integer isDisabled) {
+    public void setIsDisabled(String isDisabled) {
         this.isDisabled = isDisabled;
     }
 

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java

@@ -437,16 +437,18 @@ public class DeptServiceImpl implements IDeptService
             dept.setDescription(jsonObject.getString("description"));
             dept.setEffectOn(jsonObject.getString("effectOn"));
             dept.setSequence(jsonObject.getString("sequence"));
-            dept.setIsDeleted("true".equals(jsonObject.getString("isDeleted"))?1:0);
+            dept.setIsDeleted(jsonObject.getString("isDeleted"));
             dept.setZzDisplayPath(jsonObject.getString("zzDisplayPath"));
             dept.setName(jsonObject.getString("name"));
             dept.setGuid(jsonObject.getString("guid"));
             dept.setZzIsLeaf(jsonObject.getString("zzIsLeaf"));
-            dept.setIsDisabled("true".equals(jsonObject.getString("isDisabled"))?1:0);
+            dept.setIsDisabled(jsonObject.getString("isDisabled"));
             dept.setFullname(jsonObject.getString("fullname"));
             dept.setIsMappingUnit(jsonObject.getString("isMappingUnit"));
             dept.setSrzUnitId(jsonObject.getString("srzUnitId"));
             dept.setTaskId(jsonObject.getString("taskId"));
+            dept.setSystemId(jsonObject.getString("systemId"));
+            dept.setCreditcode(jsonObject.getString("creditcode"));
 
             Dept uniqueDept = deptMapper.selectDeptByOrganizationId(jsonObject.getString("organizationId"));
             if (null != uniqueDept && uniqueDept.getOrganizationId() != null) {

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@@ -636,6 +636,7 @@ public class UserServiceImpl implements IUserService {
             user.setCertificateTypeId(jsonObject.getString("certificateTypeId"));
             user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode"));
             user.setCertificateNumber(jsonObject.getString("certificateNumber"));
+            user.setIsMappingPerson(jsonObject.getString("isMappingPerson"));
             user.setUnits(jsonObject.getString("units"));
 
             user.randomSalt();

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

@@ -242,6 +242,8 @@
         <if test="isMappingUnit != null and isMappingUnit != ''">isMappingUnit,</if>
         <if test="srzUnitId != null and srzUnitId != ''">srzUnitId,</if>
         <if test="taskId != null and taskId != ''">taskId,</if>
+        <if test="systemId != null and systemId != ''">systemId,</if>
+        <if test="creditcode != null and creditcode != ''">creditcode,</if>
         create_time
         )values(
         <if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -277,6 +279,8 @@
         <if test="isMappingUnit != null and isMappingUnit != ''">#{isMappingUnit},</if>
         <if test="srzUnitId != null and srzUnitId != ''">#{srzUnitId},</if>
         <if test="taskId != null and taskId != ''">#{taskId},</if>
+        <if test="systemId != null and systemId != ''">#{systemId},</if>
+        <if test="creditcode != null and creditcode != ''">#{creditcode},</if>
         sysdate()
         )
     </insert>
@@ -338,6 +342,8 @@
             <if test="isMappingUnit != null and isMappingUnit != ''">isMappingUnit = #{isMappingUnit},</if>
             <if test="srzUnitId != null and srzUnitId != ''">srzUnitId = #{srzUnitId},</if>
             <if test="taskId != null and taskId != ''">taskId = #{taskId},</if>
+            <if test="systemId != null and systemId != ''">systemId = #{systemId},</if>
+            <if test="creditcode != null and creditcode != ''">creditcode = #{creditcode},</if>
             update_time = sysdate()
         </set>
         where organizationId = #{organizationId}