Merge remote-tracking branch 'origin/master'

# Conflicts:
#	lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
#	lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

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/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@@ -161,6 +161,8 @@ public class User extends BaseDomain {
 
     /** 部门id */
     private String organizationId;
+    /** 用户ID */
+    private String strUserId;
     /** 姓名 */
     private String fullname;
     /** 任务ID */
@@ -194,6 +196,14 @@ public class User extends BaseDomain {
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
 
+    public String getStrUserId() {
+        return strUserId;
+    }
+
+    public void setStrUserId(String strUserId) {
+        this.strUserId = strUserId;
+    }
+
     public String getCertificateTypeId() {
         return certificateTypeId;
     }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -92,8 +92,8 @@ public class AppThirdLoginController {
             JSONObject userOjb = JSONObject.parseObject(userJson);
             String userId = userOjb.getString("UserId");
 
-            UserBean userBean = userApi.getUserByUserId(Long.valueOf(userId));
+            UserBean userBean = userApi.getUserByUserStrId(userId);
-            redisCache.setCacheObject("shiro:app:" + userId, userBean); // todo:这里需要将转换出来的User存redis用于做权限
+            redisCache.setCacheObject("shiro:app:"+userBean.getStrUserId(), userBean); // todo:这里需要将转换出来的User存redis用于做权限
             return thirdLoginService.szyLogin(userBean.getLoginName());
         } catch (Exception e) {
             e.printStackTrace();

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java

@@ -125,6 +125,14 @@ public class UserApiImpl implements UserApi {
         return userBean;
     }
 
+    @Override
+    public UserBean getUserByUserStrId(String userId) {
+        User user = userMapper.selectUserByStrId(userId);
+        UserBean userBean = new UserBean();
+        BeanUtil.copyProperties(user, userBean);
+        return userBean;
+    }
+
     @Override
     public List<UserBean> getUserByDeptId(Long deptId, String loginName) {
         List<User> userList = userMapper.selectUserByOrgId(deptId);

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/mapper/UserMapper.java

@@ -86,6 +86,7 @@ public interface UserMapper
      * @return 用户对象信息
      */
     public User selectUserById(Long userId);
+    public User selectUserByStrId(String userId);
     public List<User> selectUserByDeptId(@Param("deptId") Long deptId, @Param("loginName") String loginName);
 
     /**

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

@@ -619,7 +619,8 @@ public class UserServiceImpl implements IUserService {
             if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; }
             User user = new User();
             user.setOrganizationId(jsonObject.getString("organizationId"));
-            user.setSrzUserid(jsonObject.getString("userId"));
+            user.setStrUserId(jsonObject.getString("userId"));
+            user.setSrzUserid(jsonObject.getString("srzUserId"));
             user.setFullname(jsonObject.getString("fullname"));
             user.setUserName(jsonObject.getString("fullname"));
             user.setTaskId(jsonObject.getString("taskId"));
@@ -636,6 +637,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}

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

@@ -45,6 +45,7 @@
         <result property="srzUserid" column="srzUserid"/>
         <result property="isMappingPerson" column="isMappingPerson"/>
         <result property="units" column="units"/>
+        <result property="strUserId" column="strUserId"/>
         <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"/>
@@ -79,7 +80,8 @@
     </resultMap>
 
     <sql id="selectUserVo">
-        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type,u.srzUserid,
+        select  u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.password,u.law_certificate_num, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id, u.type,
+       		    u.strUserId,
        		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_code,
                 t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
@@ -289,6 +291,11 @@
         where u.user_id = #{userId}
     </select>
 
+    <select id="selectUserByStrId" parameterType="String" resultMap="UserResult">
+        <include refid="selectUserVo"/>
+        where u.strUserId = #{userId}
+    </select>
+
     <select id="selectUserByDeptId" parameterType="Long" resultMap="UserResult">
         <include refid="selectUserVo"/>
         where u.dept_id = #{deptId}

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java

@@ -126,6 +126,8 @@ public class UserBean implements Serializable {
 
     /** 部门id */
     private String organizationId;
+    /** 用户ID */
+    private String strUserId;
     /** 姓名 */
     private String fullname;
     /** 任务ID */
@@ -159,6 +161,14 @@ public class UserBean implements Serializable {
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
 
+    public String getStrUserId() {
+        return strUserId;
+    }
+
+    public void setStrUserId(String strUserId) {
+        this.strUserId = strUserId;
+    }
+
     public String getOrganizationId() {
         return organizationId;
     }

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/UserApi.java

@@ -33,6 +33,7 @@ public interface UserApi {
     @GetMapping("/getUserByUserId")
     @ApiOperation("获取用户管理信息列表")
     public UserBean getUserByUserId(Long userId);
+    public UserBean getUserByUserStrId(String userId);
 
     @GetMapping("/getUserByDeptId")
     @ApiOperation("获取用户管理信息列表")