深正义部门信息接进来 , 并配合数据将我们的dept_id换成varchar类型

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java

@@ -40,7 +40,7 @@ public abstract class BaseDomain implements Serializable {
     /**
      * 部门ID
      */
-    private Long deptId;
+    private String deptId;
     /**
      * 用户ID
      */
@@ -115,11 +115,11 @@ public abstract class BaseDomain implements Serializable {
         this.params = params;
     }
 
-    public Long getDeptId() {
+    public String getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId) {
+    public void setDeptId(String deptId) {
         this.deptId = deptId;
     }
 

lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/domain/Ztree.java

@@ -12,10 +12,10 @@ public class Ztree implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
-    private Long id;
+    private String id;
 
     /** 节点父ID */
-    private Long pId;
+    private String pId;
 
     /** 节点名称 */
     private String name;
@@ -32,22 +32,22 @@ public class Ztree implements Serializable
     /** 是否能勾选 */
     private boolean nocheck = false;
 
-    public Long getId()
+    public String getId()
     {
         return id;
     }
 
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }
 
-    public Long getpId()
+    public String getpId()
     {
         return pId;
     }
 
-    public void setpId(Long pId)
+    public void setpId(String pId)
     {
         this.pId = pId;
     }

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

@@ -17,12 +17,12 @@ public class Dept extends BaseDomain {
     /**
      * 部门ID
      */
-    private Long deptId;
+    private String deptId;
 
     /**
      * 父部门ID
      */
-    private Long parentId;
+    private String parentId;
 
     /**
      * 祖级列表
@@ -92,12 +92,184 @@ public class Dept extends BaseDomain {
     /**
      * 所属机构
      */
-    private Long organizationId;
+    private String organizationId;
+    private String organizationParentId;
     /**
      * 多租户字段
      */
     private String tenantCode;
 
+    private Integer zzLevel;
+    private String code;
+    private String mappingUnitParentId;
+    private String updateAt;
+    private String createAt;
+    private String description;
+    private String effectOn;
+    private String sequence;
+    private Integer isDeleted;
+    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;
+
+    public String getOrganizationParentId() {
+        return organizationParentId;
+    }
+
+    public void setOrganizationParentId(String organizationParentId) {
+        this.organizationParentId = organizationParentId;
+    }
+
+    public Integer getZzLevel() {
+        return zzLevel;
+    }
+
+    public void setZzLevel(Integer zzLevel) {
+        this.zzLevel = zzLevel;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMappingUnitParentId() {
+        return mappingUnitParentId;
+    }
+
+    public void setMappingUnitParentId(String mappingUnitParentId) {
+        this.mappingUnitParentId = mappingUnitParentId;
+    }
+
+    public String getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(String updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    public String getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(String createAt) {
+        this.createAt = createAt;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getEffectOn() {
+        return effectOn;
+    }
+
+    public void setEffectOn(String effectOn) {
+        this.effectOn = effectOn;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public Integer getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(Integer isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public String getZzDisplayPath() {
+        return zzDisplayPath;
+    }
+
+    public void setZzDisplayPath(String zzDisplayPath) {
+        this.zzDisplayPath = zzDisplayPath;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public String getZzIsLeaf() {
+        return zzIsLeaf;
+    }
+
+    public void setZzIsLeaf(String zzIsLeaf) {
+        this.zzIsLeaf = zzIsLeaf;
+    }
+
+    public Integer getIsDisabled() {
+        return isDisabled;
+    }
+
+    public void setIsDisabled(Integer isDisabled) {
+        this.isDisabled = isDisabled;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getIsMappingUnit() {
+        return isMappingUnit;
+    }
+
+    public void setIsMappingUnit(String isMappingUnit) {
+        this.isMappingUnit = isMappingUnit;
+    }
+
+    public String getSrzUnitId() {
+        return srzUnitId;
+    }
+
+    public void setSrzUnitId(String srzUnitId) {
+        this.srzUnitId = srzUnitId;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getTenantCode() {
         return tenantCode;
     }
@@ -106,19 +278,19 @@ public class Dept extends BaseDomain {
         this.tenantCode = tenantCode;
     }
 
-    public Long getDeptId() {
+    public String getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId) {
+    public void setDeptId(String deptId) {
         this.deptId = deptId;
     }
 
-    public Long getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Long parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
@@ -256,11 +428,11 @@ public class Dept extends BaseDomain {
         this.organization = organization;
     }
 
-    public Long getOrganizationId() {
+    public String getOrganizationId() {
         return organizationId;
     }
 
-    public void setOrganizationId(Long organizationId) {
+    public void setOrganizationId(String organizationId) {
         this.organizationId = organizationId;
     }
 

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

@@ -35,12 +35,12 @@ public class User extends BaseDomain {
      * 部门ID
      */
     @Excel(name = "部门编号", type = Excel.Type.IMPORT)
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门父ID
      */
-    private Long parentId;
+    private String parentId;
 
     /**
      * 角色ID
@@ -181,6 +181,10 @@ public class User extends BaseDomain {
     private String guid;
     /** 手机号 */
     private String mobileNumber;
+    /** 证件类型 */
+    private String certificateTypeId;
+    /** 证件类型代码 */
+    private String certificateTypeIdCode;
     /** 证件号码 */
     private String certificateNumber;
     /** 省认证用户id */
@@ -190,6 +194,22 @@ public class User extends BaseDomain {
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
 
+    public String getCertificateTypeId() {
+        return certificateTypeId;
+    }
+
+    public void setCertificateTypeId(String certificateTypeId) {
+        this.certificateTypeId = certificateTypeId;
+    }
+
+    public String getCertificateTypeIdCode() {
+        return certificateTypeIdCode;
+    }
+
+    public void setCertificateTypeIdCode(String certificateTypeIdCode) {
+        this.certificateTypeIdCode = certificateTypeIdCode;
+    }
+
     public String getLawCertificateNum() {
         return lawCertificateNum;
     }
@@ -259,19 +279,19 @@ public class User extends BaseDomain {
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId() {
+    public String getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId) {
+    public void setDeptId(String deptId) {
         this.deptId = deptId;
     }
 
-    public Long getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Long parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 

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

@@ -15,11 +15,14 @@ import com.zdxt.common.ZDResponse;
 import com.zdxt.common.util.RedisCache;
 import com.zdxt.domain.auth.User;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,6 +46,8 @@ public class AppThirdLoginController {
 
     @Value("${szypt.corpid}")
     private String szyptCorpid;
+    @Value("${szypt.agentid}")
+    private String szyptAgentid;
     @Value("${szypt.corpsecret}")
     private String szyptCorpsecret;
     @Value("${szypt.url}")
@@ -72,14 +77,8 @@ public class AppThirdLoginController {
         try {
             // 获取 access_token
             accessTokenJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null);
-            System.out.println("====================== accessToken ======================");
-            System.out.println(accessTokenJson);
-            System.out.println("====================== accessToken ======================");
             JSONObject tokenObj = JSONObject.parseObject(accessTokenJson);
             String token = tokenObj.getString("access_token");
-            System.out.println("====================== token ======================");
-            System.out.println(token);
-            System.out.println("====================== token ======================");
 
             // 获取 用户Id
             userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
@@ -89,14 +88,9 @@ public class AppThirdLoginController {
             JSONObject userOjb = JSONObject.parseObject(userJson);
             String userId = userOjb.getString("UserId");
 
-            // 通过用户Id 读取成员信息
-//            userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
-
             UserBean userBean = userApi.getUserByUserId(Long.valueOf(userId));
-            System.out.println("---> userLogin : "+userBean.getLoginName());
-
-
             redisCache.setCacheObject("shiro:app:1731", userBean); // todo:这里需要将转换出来的User存redis用于做权限
+            return thirdLoginService.szyLogin(userBean.getLoginName());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -104,6 +98,43 @@ public class AppThirdLoginController {
         return ZDResponse.success();
     }
 
+    /**
+     * 深圳易平台使用权限签名算法
+     */
+    @GetMapping("/szyptGetToken")
+    @ResponseBody
+    public ZDResponse szyptGetToken(@RequestParam("code") String code, @RequestParam("url") String url){
+        try {
+            // 获取 access_token
+            String accessTokenJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null);
+            JSONObject tokenObj = JSONObject.parseObject(accessTokenJson);
+            String token = tokenObj.getString("access_token");
+            String jsapiTicket = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/get_jsapi_ticket?access_token="+token, null);
+            JSONObject ticketObj = JSONObject.parseObject(jsapiTicket);
+            String ticket = ticketObj.getString("ticket");
+            System.out.println("====================== jsapiTicket ======================");
+            System.out.println(ticket);
+            System.out.println("====================== jsapiTicket ======================");
+
+            long timestamp = System.currentTimeMillis() / 1000;
+            //随机字符串
+            String nonceStr = "Wm3WZYTPz0wzccnW";
+            String signature = getSignature(ticket, nonceStr, timestamp, url);
+
+            Map<String, Object> data = new HashMap<>();
+            data.put("agentid", szyptAgentid);
+            data.put("corpid", szyptCorpid);
+            data.put("timestamp", timestamp);
+            data.put("nonceStr", nonceStr);
+            data.put("signature", signature);
+            return ZDResponse.success("操作成功", data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return ZDResponse.success("操作成功", null);
+    }
+
 
     @Autowired private IUserService iUserService;
 
@@ -199,4 +230,19 @@ public class AppThirdLoginController {
         thirdLoginService.addSiqUserCompany(userInfo);
         return thirdLoginService.siqLogin(userInfo);
     }
+
+    private String getSignature(String ticket, String nonceStr, long timestamp, String url) {
+        try {
+
+            String unEncryptStr = "jsapi_ticket=" + ticket + "&noncestr=" + nonceStr + "&timestamp=" + timestamp + "&url=" + url;
+            MessageDigest sha = MessageDigest.getInstance("SHA");
+            // 调用digest方法，进行加密操作
+            byte[] cipherBytes = sha.digest(unEncryptStr.getBytes());
+            String encryptStr = Hex.encodeHexString(cipherBytes);
+            return encryptStr;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.project.system.dept.service.IDeptService;
 import com.zdxt.auth.project.system.user.service.IUserService;
 import com.zdxt.code.service.ThirdLoginService;
 import com.zdxt.code.utils.HttpUtil;
@@ -51,6 +52,7 @@ public class UserInfoAndDeptTask {
 
     @Autowired private UserApi userApi;
     @Autowired private IUserService userService;
+    @Autowired private IDeptService deptService;
 
     private static final Logger log = LoggerFactory.getLogger(UserInfoAndDeptTask.class);
 
@@ -86,9 +88,7 @@ public class UserInfoAndDeptTask {
                 JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
                 JSONArray dataArr = tmpJsonObj.getJSONArray("data");
                 if (null == dataArr || dataArr.size()==0) { break; }
-//                System.out.println("用户 : "+ page +" -----------> "+ (null == dataArr || "".equals(dataArr)));
-                Map<String, Integer> resMap = new HashMap<>();
-                resMap = userService.addSrzUser(dataArr);
+                Map<String, Integer> resMap = userService.addSrzUser(dataArr);
                 sumMap.add(resMap);
                 page++;
             }
@@ -114,17 +114,25 @@ public class UserInfoAndDeptTask {
 
             page = 0;
             // 获取 部门信息
-//            while (true) {
-//                String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
-//                JSONObject sourceObj = JSONObject.parseObject(deptInfoJson);
-//                JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
-//                JSONArray dataArr = tmpJsonObj.getJSONArray("data");
-//                if (null == dataArr || dataArr.size()==0) { break; }
-//                // 插入更新数据库
-//                System.out.println("部门 : "+ page +" -----------> "+ (null == dataArr || "".equals(dataArr)));
-////                userService.addSrzUser(dataArr);
-//                page++;
-//            }
+            while (true) {
+                String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
+                JSONObject sourceObj = JSONObject.parseObject(deptInfoJson);
+                JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
+                JSONArray dataArr = tmpJsonObj.getJSONArray("data");
+                if (null == dataArr || dataArr.size()==0) { break; }
+                // 插入更新数据库
+                Map<String, Integer> resMap = deptService.addSrzDept(dataArr);
+                sumMap.add(resMap);
+                page++;
+            }
+
+            insertNum = 0;
+            updateNum = 0;
+            for (Map<String, Integer> item : sumMap) {
+                insertNum += item.get("insertNum");
+                updateNum += item.get("updateNum");
+            }
+            log.info("新增部门数量 : {}  /  更新部门数量 : {}", insertNum, updateNum);
 
             // 注销token
             destroyTken = connect("/ebus/sfrzhqxglmk/sysPullLogout?token="+token);
@@ -140,19 +148,21 @@ public class UserInfoAndDeptTask {
 
     public void testRun() {
         String path = "/uploadPath/userInfo.txt"; // 替换为你的JSON文件路径
+//        String path = "/uploadPath/detpInfo.txt"; // 替换为你的JSON文件路径
         try {
             int page = 0;
             int pageSize = 20;
             List<Map<String, Integer>> sumMap = new ArrayList<>();
             while (true) {
-                String userInfoJson = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
-                System.out.println(userInfoJson);
-                JSONObject sourceObj = JSONObject.parseObject(userInfoJson);
+                String deptInfoJson = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+                System.out.println(deptInfoJson);
+                JSONObject sourceObj = JSONObject.parseObject(deptInfoJson);
                 JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
                 JSONArray dataArr = tmpJsonObj.getJSONArray("data");
                 if (null == dataArr || dataArr.size()==0 || page>0) { break; }
                 Map<String, Integer> resMap = new HashMap<>();
                 resMap = userService.addSrzUser(dataArr);
+//                resMap = deptService.addSrzDept(dataArr);
                 sumMap.add(resMap);
                 page++;
             }
@@ -211,8 +221,8 @@ public class UserInfoAndDeptTask {
         userBean.setTaskId(userJson.getString("taskId"));
         userBean.setSystemId(userJson.getString("systemId"));
         userBean.setEffectOn(userJson.getString("effectOn"));
-        userBean.setIsDeleted(Integer.valueOf(userJson.getString("isDeleted")));
-        userBean.setIsDisabled(Integer.valueOf(userJson.getString("isDisabled")));
+        userBean.setIsDeleted(userJson.getString("isDeleted"));
+        userBean.setIsDisabled(userJson.getString("isDisabled"));
         userBean.setCreateAt(userJson.getString("createAt"));
         userBean.setUpdateAt(userJson.getString("updateAt"));
         userBean.setGuid(userJson.getString("guid"));

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/organization/OrganizationZtree.java

@@ -32,7 +32,7 @@ public class OrganizationZtree implements IOrganizationApi {
     private UserMapper userMapper;
 
     @Override
-    public List<Map<String, Object>> getOrganizationData(Long deptId) {
+    public List<Map<String, Object>> getOrganizationData(String deptId) {
         Dept dept = new Dept();
         dept.setDeptId(deptId);
         //获取组织架构
@@ -44,7 +44,7 @@ public class OrganizationZtree implements IOrganizationApi {
     }
 
     @Override
-    public List<Map<String, Object>> getOrganizationUserData(Long deptId) {
+    public List<Map<String, Object>> getOrganizationUserData(String deptId) {
         User user =  new User();
         user.setDeptId(deptId);
         Dept dept = new Dept();

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

@@ -37,7 +37,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
-    public List<DeptBean> getChildrenDeptById(Long deptId) {
+    public List<DeptBean> getChildrenDeptById(String deptId) {
         ArrayList<DeptBean> beanList = new ArrayList<>();
         List<Dept> deptList = deptMapper.selectChildrenDeptById(deptId);
         for (Dept dept : deptList) {
@@ -49,7 +49,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
-    public List<DeptBean> getChildrenDeptByIdAndInDeptType(Long deptId, String[] deptTypes) {
+    public List<DeptBean> getChildrenDeptByIdAndInDeptType(String deptId, String[] deptTypes) {
         ArrayList<DeptBean> beanList = new ArrayList<>();
         List<Dept> deptList = deptMapper.getChildrenDeptByIdAndInDeptType(deptId, deptTypes);
         for (Dept dept : deptList) {
@@ -99,6 +99,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
 
+    @Override
     public List<DeptBean> getDeptList(DeptBean deptBean) {
         Dept dept = new Dept();
         BeanUtil.copyProperties(deptBean, dept);
@@ -116,7 +117,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
-    public DeptBean getDeptById(Long deptId) {
+    public DeptBean getDeptById(String deptId) {
         DeptBean bean = new DeptBean();
         Dept dept = deptMapper.selectDeptById(deptId);
         BeanUtil.copyProperties(dept, bean);
@@ -162,7 +163,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
-    public Long insertDept(DeptBean deptBean) {
+    public String insertDept(DeptBean deptBean) {
         Dept dept = new Dept();
         BeanUtil.copyProperties(deptBean, dept);
         int res = iDeptService.insertDept(dept);
@@ -170,7 +171,7 @@ public class DeptApiImpl implements DeptApi {
     }
 
     @Override
-    public Long updateDept(DeptBean deptBean) {
+    public String updateDept(DeptBean deptBean) {
         Dept dept = new Dept();
         BeanUtil.copyProperties(deptBean, dept);
         int res = iDeptService.updateDeptName(dept);
@@ -180,7 +181,7 @@ public class DeptApiImpl implements DeptApi {
     /**
      * 根据部门信息获取当前及一下所有部门(下钻)
      *
-     * @param dept 部门信息
+     * @param bean 部门信息
      * @return 部门信息集合
      */
     @Override

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

@@ -80,7 +80,7 @@ public class UserApiImpl implements UserApi {
                     //根据部门id查询详细信息
                     Dept dept1 = null;
                     //字符串为空时不执行转换
-                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(Long.parseLong(deptIdArr[i]));}
+                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(deptIdArr[i]);}
                     if(BeanUtil.isNotEmpty(dept1)){
                         //设置机构信息
                         judgeType(deptBean,dept1);
@@ -258,7 +258,7 @@ public class UserApiImpl implements UserApi {
             userBean.setPassword("123456");
             userBean.setCreateTime(DateUtils.getNowDate());
             //部门ID设置为默认值
-            userBean.setDeptId(405L);
+            userBean.setDeptId("405");
 
             return this.insertUserResId(userBean);
         }
@@ -314,7 +314,7 @@ public class UserApiImpl implements UserApi {
                     //根据部门id查询详细信息
                     Dept dept1 = null;
                     //字符串为空时不执行转换
-                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(Long.parseLong(deptIdArr[i]));}
+                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(deptIdArr[i]);}
                     if(BeanUtil.isNotEmpty(dept1)){
                         //设置机构信息
                         judgeType(deptBean,dept1);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/kingdee/service/impl/KingdeeDataSyncServiceImpl.java

@@ -323,10 +323,10 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
             dept.setAncestors(parentDept.getAncestors() + "," + parentDept.getDeptId());
         } else if (ObjectUtil.isEmpty(syncOrg.getParentId())) {
             // 如果没有父部门，则默认是根部门
-            dept.setParentId(0L);
+            dept.setParentId("0");
             dept.setAncestors("0");
         } else {
-            dept.setParentId(99999999L);
+            dept.setParentId("99999999");
             dept.setAncestors("0");
         }
 
@@ -399,7 +399,7 @@ public class KingdeeDataSyncServiceImpl implements KingdeeDataSyncService {
             Dept parent = deptMapper.selectDeptByKingdeeOrgId(noParentDept.getKingdeeOrgParentId());
             if (BeanUtil.isNotEmpty(parent)) {
                 // 检查这个父部门是否已经设置好“本身的祖籍和父部门”
-                if (parent.getParentId() != 99999999L) {
+                if (parent.getParentId().equals("99999999")) {
                     noParentDept.setParentId(parent.getDeptId());
                     noParentDept.setAncestors(parent.getAncestors() + "," + parent.getDeptId());
                     deptService.updateDeptIsKingDee(noParentDept);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java

@@ -78,7 +78,7 @@ public class DeptController extends BaseController {
      * 新增部门
      */
 //    @GetMapping("/add/{parentId}")
-    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
+    public String add(@PathVariable("parentId") String parentId, ModelMap mmap)
     {
         mmap.put("dept", deptService.selectDeptById(parentId));
         return prefix + "/add";
@@ -104,10 +104,10 @@ public class DeptController extends BaseController {
      * 修改
      */
     @GetMapping("/edit/{deptId}")
-    public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap)
+    public String edit(@PathVariable("deptId") String deptId, ModelMap mmap)
     {
         Dept dept = deptService.selectDeptById(deptId);
-        if (StringUtils.isNotNull(dept) && 100L == deptId)
+        if (StringUtils.isNotNull(dept) && "100".equals(deptId))
         {
             dept.setParentName("无");
         }
@@ -167,7 +167,7 @@ public class DeptController extends BaseController {
     @RequiresPermissions("system:dept:remove")
 //    @GetMapping("/remove/{deptId}")
     @ResponseBody
-    public AjaxResult remove(@PathVariable("deptId") Long deptId)
+    public AjaxResult remove(@PathVariable("deptId") String deptId)
     {
         if (deptService.selectDeptCount(deptId) > 0)
         {
@@ -194,7 +194,7 @@ public class DeptController extends BaseController {
      * 选择部门树
      */
     @GetMapping("/selectDeptTree/{deptId}")
-    public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap)
+    public String selectDeptTree(@PathVariable("deptId") String deptId, ModelMap mmap)
     {
         mmap.put("dept", deptService.selectDeptById(deptId));
         return prefix + "/tree";

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java

@@ -48,7 +48,7 @@ public interface DeptMapper
      * @param deptId 部门ID
      * @return 结果
      */
-    public int checkDeptExistUser(Long deptId);
+    public int checkDeptExistUser(String deptId);
 
     /**
      * 查询部门管理数据
@@ -72,7 +72,7 @@ public interface DeptMapper
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(String deptId);
 
     /**
      * 新增部门信息
@@ -89,6 +89,7 @@ public interface DeptMapper
      * @return 结果
      */
     public int updateDept(Dept dept);
+    public int updateDeptByOrganizationId(Dept dept);
 
     /**
      * 修改子元素关系
@@ -104,7 +105,8 @@ public interface DeptMapper
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public Dept selectDeptById(Long deptId);
+    public Dept selectDeptById(String deptId);
+    public Dept selectDeptByOrganizationId(String organizationId);
 
     /**
      * 校验部门名称是否唯一
@@ -113,7 +115,7 @@ public interface DeptMapper
      * @param parentId 父部门ID
      * @return 结果
      */
-    public Dept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+    public Dept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") String parentId);
 
     /**
      * 根据角色ID查询部门
@@ -136,7 +138,7 @@ public interface DeptMapper
      * @param deptId 部门ID
      * @return 部门列表
      */
-    public List<Dept> selectChildrenDeptById(Long deptId);
+    public List<Dept> selectChildrenDeptById(String deptId);
 
 
     /**
@@ -145,7 +147,7 @@ public interface DeptMapper
      * @param deptId 部门ID
      * @return 部门列表
      */
-    public List<Dept> getChildrenDeptByIdAndInDeptType(@Param("deptId") Long deptId, @Param("deptTypes") String[] deptTypes);
+    public List<Dept> getChildrenDeptByIdAndInDeptType(@Param("deptId") String deptId, @Param("deptTypes") String[] deptTypes);
 
     /**
      * 根据条件查询所有子部门，id必须传

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

@@ -1,5 +1,7 @@
 package com.zdxt.auth.project.system.dept.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.zdxt.auth.common.constant.UserConstants;
 import com.zdxt.auth.common.exception.BusinessException;
 import com.zdxt.auth.common.utils.StringUtils;
@@ -11,12 +13,15 @@ import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.Role;
 import com.zdxt.domain.auth.SysTenant;
 
+import com.zdxt.domain.auth.User;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 部门管理 服务实现
@@ -64,6 +69,7 @@ public class DeptServiceImpl implements IDeptService
      * @param kingdeeOrgId
      * @return
      */
+    @Override
     public Dept selectDeptByKingdeeOrgId(String kingdeeOrgId) {
         return deptMapper.selectDeptByKingdeeOrgId(kingdeeOrgId);
     }
@@ -186,7 +192,7 @@ public class DeptServiceImpl implements IDeptService
      * @return 结果
      */
     @Override
-    public int selectDeptCount(Long parentId)
+    public int selectDeptCount(String parentId)
     {
         Dept dept = new Dept();
         dept.setParentId(parentId);
@@ -200,7 +206,7 @@ public class DeptServiceImpl implements IDeptService
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
+    public boolean checkDeptExistUser(String deptId)
     {
         int result = deptMapper.checkDeptExistUser(deptId);
         return result > 0 ? true : false;
@@ -213,7 +219,7 @@ public class DeptServiceImpl implements IDeptService
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
+    public int deleteDeptById(String deptId)
     {
         return deptMapper.deleteDeptById(deptId);
     }
@@ -270,6 +276,7 @@ public class DeptServiceImpl implements IDeptService
         return result;
     }
 
+    @Override
     public int updateDeptName(Dept dept) {
         return deptMapper.updateDept(dept);
     }
@@ -294,7 +301,7 @@ public class DeptServiceImpl implements IDeptService
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    public void updateDeptChildren(String deptId, String newAncestors, String oldAncestors)
     {
         List<Dept> children = deptMapper.selectChildrenDeptById(deptId);
         for (Dept child : children)
@@ -313,7 +320,7 @@ public class DeptServiceImpl implements IDeptService
      * @param deptId 部门ID
      * @param ancestors 元素列表
      */
-    public void updateDeptChildren(Long deptId, String ancestors)
+    public void updateDeptChildren(String deptId, String ancestors)
     {
         Dept dept = new Dept();
         dept.setParentId(deptId);
@@ -335,7 +342,7 @@ public class DeptServiceImpl implements IDeptService
      * @return 部门信息
      */
     @Override
-    public Dept selectDeptById(Long deptId)
+    public Dept selectDeptById(String deptId)
     {
         return deptMapper.selectDeptById(deptId);
     }
@@ -349,9 +356,9 @@ public class DeptServiceImpl implements IDeptService
     @Override
     public String checkDeptNameUnique(Dept dept)
     {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        String deptId = StringUtils.isNull(dept.getDeptId()) ? "-1" : dept.getDeptId();
         Dept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        if (StringUtils.isNotNull(info) && info.getDeptId().equals(deptId))
         {
             return UserConstants.DEPT_NAME_NOT_UNIQUE;
         }
@@ -384,7 +391,7 @@ public class DeptServiceImpl implements IDeptService
     public Dept insertSysDeptDefault(SysTenant tenant) {
         Dept dept = new Dept();
         //父级部门
-        dept.setParentId(new Long(0));
+        dept.setParentId("0");
         dept.setDeptName(tenant.getTenantName());
         dept.setAncestors("0");
         dept.setTenantCode(tenant.getTenantCode());
@@ -407,4 +414,54 @@ public class DeptServiceImpl implements IDeptService
     public List<Dept> selectDeptListHole(Dept dept){
         return deptMapper.selectDeptListHole(dept);
     }
+
+
+    @Override
+    public Map<String, Integer> addSrzDept(JSONArray dataArr) {
+        int insertNum = 0;
+        int updateNum = 0;
+        for (int i = 0; i < dataArr.size(); i++) {
+            JSONObject jsonObject = dataArr.getJSONObject(i);
+            if (StringUtils.isEmpty(jsonObject.getString("organizationId"))) { continue; }
+            Dept dept = new Dept();
+            dept.setDeptId(jsonObject.getString("organizationId"));
+            dept.setParentId(jsonObject.getString("parentId"));
+            dept.setDeptName(jsonObject.getString("name"));
+            dept.setOrganizationId(jsonObject.getString("organizationId"));
+            dept.setOrganizationParentId(jsonObject.getString("parentId"));
+            dept.setZzLevel(Integer.valueOf(jsonObject.getString("zzLevel")));
+            dept.setCode(jsonObject.getString("code"));
+            dept.setMappingUnitParentId(jsonObject.getString("mappingUnitParentId"));
+            dept.setUpdateAt(jsonObject.getString("updateAt"));
+            dept.setCreateAt(jsonObject.getString("createAt"));
+            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.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.setFullname(jsonObject.getString("fullname"));
+            dept.setIsMappingUnit(jsonObject.getString("isMappingUnit"));
+            dept.setSrzUnitId(jsonObject.getString("srzUnitId"));
+            dept.setTaskId(jsonObject.getString("taskId"));
+
+            Dept uniqueDept = deptMapper.selectDeptByOrganizationId(jsonObject.getString("organizationId"));
+            if (null != uniqueDept && uniqueDept.getOrganizationId() != null) {
+                // 跟新数据库
+                int rowNum = deptMapper.updateDeptByOrganizationId(dept);
+                updateNum += rowNum;
+            } else {
+                // 插入数据库
+                int rowNum = deptMapper.insertDept(dept);
+                insertNum += rowNum;
+            }
+        }
+        Map<String, Integer> resMap = new HashedMap();
+        resMap.put("insertNum", insertNum);
+        resMap.put("updateNum", updateNum);
+        return resMap;
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.zdxt.auth.project.system.dept.service;
 
 import java.util.List;
+import java.util.Map;
 
+import com.alibaba.fastjson.JSONArray;
 import com.zdxt.common.domain.Ztree;
 import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.Role;
@@ -68,7 +70,7 @@ public interface IDeptService
      * @param parentId 父部门ID
      * @return 结果
      */
-    public int selectDeptCount(Long parentId);
+    public int selectDeptCount(String parentId);
 
     /**
      * 查询部门是否存在用户
@@ -76,7 +78,7 @@ public interface IDeptService
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+    public boolean checkDeptExistUser(String deptId);
 
     /**
      * 删除部门管理信息
@@ -84,7 +86,7 @@ public interface IDeptService
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(String deptId);
 
     /**
      * 新增保存部门信息
@@ -93,6 +95,7 @@ public interface IDeptService
      * @return 结果
      */
     public int insertDept(Dept dept);
+    public Map<String, Integer> addSrzDept(JSONArray dataArr);
 
     /**
      * 修改保存部门信息
@@ -115,7 +118,7 @@ public interface IDeptService
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public Dept selectDeptById(Long deptId);
+    public Dept selectDeptById(String deptId);
 
     /**
      * 校验部门名称是否唯一

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dict/service/DictTypeServiceImpl.java

@@ -172,7 +172,7 @@ public class DictTypeServiceImpl implements IDictTypeService
             if (UserConstants.DICT_NORMAL.equals(dict.getStatus()))
             {
                 Ztree ztree = new Ztree();
-                ztree.setId(dict.getDictId());
+                ztree.setId(dict.getDictId().toString());
                 ztree.setName(transDictName(dict));
                 ztree.setTitle(dict.getDictType());
                 ztrees.add(ztree);

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/menu/service/MenuServiceImpl.java

@@ -226,8 +226,8 @@ public class MenuServiceImpl implements IMenuService
         for (Menu menu : menuList)
         {
             Ztree ztree = new Ztree();
-            ztree.setId(menu.getMenuId());
-            ztree.setpId(menu.getParentId());
+            ztree.setId(menu.getMenuId().toString());
+            ztree.setpId(menu.getParentId().toString());
             ztree.setName(transMenuName(menu, permsFlag));
             ztree.setTitle(menu.getMenuName());
             if (isCheck)

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/tenant/service/impl/SysTenantServiceImpl.java

@@ -201,7 +201,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
     private List<RoleDept> getSysRoleDepts(Dept dept, Role role) {
         List<RoleDept> roleDeptList = new ArrayList<>();
         RoleDept roleDept = new RoleDept();
-        roleDept.setDeptId(dept.getDeptId());
+        roleDept.setDeptId(Long.valueOf(dept.getDeptId()));
         roleDept.setRoleId(role.getRoleId());
         roleDeptList.add(roleDept);
         return roleDeptList;

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

@@ -566,7 +566,7 @@ public class UserServiceImpl implements IUserService {
                     //根据部门id查询详细信息
                     Dept dept1 = null;
                     //字符串为空时不执行转换
-                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(Long.parseLong(deptIdArr[i]));}
+                    if(!"null".equals(deptIdArr[i])){dept1 = deptMapper.selectDeptById(deptIdArr[i]);}
                     if(BeanUtil.isNotEmpty(dept1)){
                         //设置机构信息
                         judgeType(dept,dept1);
@@ -593,7 +593,7 @@ public class UserServiceImpl implements IUserService {
             //机构名称
             dept.setOrganization(dept1.getDeptName());
             //机构id
-            dept.setOrganizationId(dept1.getDeptId());
+            dept.setOrganizationId(dept1.getDeptId().toString());
         }
 
     }
@@ -611,11 +611,10 @@ public class UserServiceImpl implements IUserService {
     public Map<String, Integer> addSrzUser(JSONArray dataArr) {
         int insertNum = 0;
         int updateNum = 0;
-        List<User> users = new ArrayList<>();
         for (int i = 0; i < dataArr.size(); i++) {
             JSONObject jsonObject = dataArr.getJSONObject(i);
             // 通过登录名判断用户是否存在
-            checkLoginNameUnique(jsonObject.getString("username"));
+//            checkLoginNameUnique(jsonObject.getString("username"));
 
             if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; }
             User user = new User();
@@ -633,6 +632,9 @@ public class UserServiceImpl implements IUserService {
             user.setUpdateAt(jsonObject.getString("updateAt"));
             user.setGuid(jsonObject.getString("guid"));
             user.setMobileNumber(jsonObject.getString("mobileNumber"));
+            user.setEmail(jsonObject.getString("email"));
+            user.setCertificateTypeId(jsonObject.getString("certificateTypeId"));
+            user.setCertificateTypeIdCode(jsonObject.getString("certificateTypeIdCode"));
             user.setCertificateNumber(jsonObject.getString("certificateNumber"));
             user.setUnits(jsonObject.getString("units"));
 

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

@@ -24,12 +24,33 @@
         <result property="kingdeeOrgId" column="kingdee_org_id"/>
         <result property="kingdeeOrgParentId" column="kingdee_org_parent_id"/>
         <result property="tenantCode" column="tenant_code"/>
+        <result property="organizationId" column="organizationId"/>
+        <result property="organizationParentId" column="organizationParentId"/>
+        <result property="zzLevel" column="zzLevel"/>
+        <result property="code" column="code"/>
+        <result property="mappingUnitParentId" column="mappingUnitParentId"/>
+        <result property="updateAt" column="updateAt"/>
+        <result property="createAt" column="createAt"/>
+        <result property="description" column="description"/>
+        <result property="effectOn" column="effectOn"/>
+        <result property="sequence" column="sequence"/>
+        <result property="isDeleted" column="isDeleted"/>
+        <result property="zzDisplayPath" column="zzDisplayPath"/>
+        <result property="name" column="name"/>
+        <result property="guid" column="guid"/>
+        <result property="zzIsLeaf" column="zzIsLeaf"/>
+        <result property="isDisabled" column="isDisabled"/>
+        <result property="fullname" column="fullname"/>
+        <result property="isMappingUnit" column="isMappingUnit"/>
+        <result property="srzUnitId" column="srzUnitId"/>
+        <result property="taskId" column="taskId"/>
 
     </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 from sys_dept d
+        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 from sys_dept d
     </sql>
 
     <insert id="insertDeptIsKingDee" parameterType="Dept"  keyProperty="deptId" useGeneratedKeys="true">
@@ -37,8 +58,8 @@
             SELECT LAST_INSERT_ID()
         </selectKey>
         insert into sys_dept(
-        <if test="deptId != null and deptId != 0">dept_id,</if>
-        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="deptId != null and deptId != ''">dept_id,</if>
+        <if test="parentId != null and parentId != ''">parent_id,</if>
         <if test="deptName != null and deptName != ''">dept_name,</if>
         <if test="ancestors != null and ancestors != ''">ancestors,</if>
         <if test="orderNum != null and orderNum != ''">order_num,</if>
@@ -53,8 +74,8 @@
         <if test="kingdeeOrgParentId != null and kingdeeOrgParentId != ''">kingdee_org_parent_id,</if>
         create_time
         )values(
-        <if test="deptId != null and deptId != 0">#{deptId},</if>
-        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="parentId != null and parentId != ''">#{parentId},</if>
         <if test="deptName != null and deptName != ''">#{deptName},</if>
         <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
         <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
@@ -92,7 +113,7 @@
     <select id="selectDeptList" parameterType="Dept" resultMap="DeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-        <if test="parentId != null and parentId != 0">
+        <if test="parentId != null and parentId != ''">
             AND parent_id = #{parentId}
         </if>
         <if test="deptName != null and deptName != ''">
@@ -116,7 +137,7 @@
     <select id="selectDeptListByNoPermission" parameterType="Dept" resultMap="DeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-        <if test="parentId != null and parentId != 0">
+        <if test="parentId != null and parentId != ''">
             AND parent_id = #{parentId}
         </if>
         <if test="deptName != null and deptName != ''">
@@ -135,8 +156,8 @@
     <select id="selectDeptCount" parameterType="Dept" resultType="int">
         select count(1) from sys_dept
         where del_flag = '0'
-        <if test="deptId != null and deptId != 0">and dept_id = #{deptId}</if>
-        <if test="parentId != null and parentId != 0">and parent_id = #{parentId}</if>
+        <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+        <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
     </select>
 
     <select id="checkDeptNameUnique" resultMap="DeptResult">
@@ -151,7 +172,16 @@
 		where d.dept_id = #{deptId}
 	</select>
 
-    <select id="selectChildrenDeptById" parameterType="Long" resultMap="DeptResult">
+    <select id="selectDeptByOrganizationId" parameterType="String" resultMap="DeptResult">
+		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.dept_type,
+			(select dept_name from sys_dept where organizationId = d.organizationParentId) parent_name, d.organizationId, d.organizationParentId,
+			 d.zzLevel, d.code, d.mappingUnitParentId, d.updateAt, d.createAt, d.description, d.effectOn, d.sequence, d.isDeleted,
+			 d.zzDisplayPath, d.`name`, d.guid, d.zzIsLeaf, d.isDisabled, d.fullname, d.isMappingUnit, d.srzUnitId, d.taskId
+		from sys_dept d
+		where d.organizationId = #{organizationId}
+	</select>
+
+    <select id="selectChildrenDeptById" parameterType="String" resultMap="DeptResult">
 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
 	</select>
 
@@ -179,8 +209,8 @@
 
     <insert id="insertDept" parameterType="Dept"  keyProperty="deptId" useGeneratedKeys="true">
         insert into sys_dept(
-        <if test="deptId != null and deptId != 0">dept_id,</if>
-        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="deptId != null and deptId != ''">dept_id,</if>
+        <if test="parentId != null and parentId != ''">parent_id,</if>
         <if test="deptName != null and deptName != ''">dept_name,</if>
         <if test="ancestors != null and ancestors != ''">ancestors,</if>
         <if test="orderNum != null and orderNum != ''">order_num,</if>
@@ -193,10 +223,29 @@
         <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id,</if>
         <if test="kingdeeOrgParentId != null and kingdeeOrgParentId != ''">kingdee_org_parent_id,</if>
         <if test="tenantCode != null and tenantCode != ''">tenant_code,</if>
+        <if test="organizationId != null and organizationId != ''">organizationId,</if>
+        <if test="zzLevel != null and zzLevel != ''">zzLevel,</if>
+        <if test="code != null and code != ''">code,</if>
+        <if test="mappingUnitParentId != null and mappingUnitParentId != ''">mappingUnitParentId,</if>
+        <if test="updateAt != null and updateAt != ''">updateAt,</if>
+        <if test="createAt != null and createAt != ''">createAt,</if>
+        <if test="description != null and description != ''">description,</if>
+        <if test="effectOn != null and effectOn != ''">effectOn,</if>
+        <if test="sequence != null and sequence != ''">sequence,</if>
+        <if test="isDeleted != null and isDeleted != ''">isDeleted,</if>
+        <if test="zzDisplayPath != null and zzDisplayPath != ''">zzDisplayPath,</if>
+        <if test="name != null and name != ''">`name`,</if>
+        <if test="guid != null and guid != ''">guid,</if>
+        <if test="zzIsLeaf != null and zzIsLeaf != ''">zzIsLeaf,</if>
+        <if test="isDisabled != null and isDisabled != ''">isDisabled,</if>
+        <if test="fullname != null and fullname != ''">fullname,</if>
+        <if test="isMappingUnit != null and isMappingUnit != ''">isMappingUnit,</if>
+        <if test="srzUnitId != null and srzUnitId != ''">srzUnitId,</if>
+        <if test="taskId != null and taskId != ''">taskId,</if>
         create_time
         )values(
-        <if test="deptId != null and deptId != 0">#{deptId},</if>
-        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="parentId != null and parentId != ''">#{parentId},</if>
         <if test="deptName != null and deptName != ''">#{deptName},</if>
         <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
         <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
@@ -209,6 +258,25 @@
         <if test="kingdeeOrgId != null and kingdeeOrgId != ''">#{kingdeeOrgId},</if>
         <if test="kingdeeOrgParentId != null and kingdeeOrgParentId != ''">#{kingdeeOrgParentId},</if>
         <if test="tenantCode != null and tenantCode != ''">#{tenantCode},</if>
+        <if test="organizationId != null and organizationId != ''">#{organizationId},</if>
+        <if test="zzLevel != null and zzLevel != ''">#{zzLevel},</if>
+        <if test="code != null and code != ''">#{code},</if>
+        <if test="mappingUnitParentId != null and mappingUnitParentId != ''">#{mappingUnitParentId},</if>
+        <if test="updateAt != null and updateAt != ''">#{updateAt},</if>
+        <if test="createAt != null and createAt != ''">#{createAt},</if>
+        <if test="description != null and description != ''">#{description},</if>
+        <if test="effectOn != null and effectOn != ''">#{effectOn},</if>
+        <if test="sequence != null and sequence != ''">#{sequence},</if>
+        <if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
+        <if test="zzDisplayPath != null and zzDisplayPath != ''">#{zzDisplayPath},</if>
+        <if test="name != null and name != ''">#{name},</if>
+        <if test="guid != null and guid != ''">#{guid},</if>
+        <if test="zzIsLeaf != null and zzIsLeaf != ''">#{zzIsLeaf},</if>
+        <if test="isDisabled != null and isDisabled != ''">#{isDisabled},</if>
+        <if test="fullname != null and fullname != ''">#{fullname},</if>
+        <if test="isMappingUnit != null and isMappingUnit != ''">#{isMappingUnit},</if>
+        <if test="srzUnitId != null and srzUnitId != ''">#{srzUnitId},</if>
+        <if test="taskId != null and taskId != ''">#{taskId},</if>
         sysdate()
         )
     </insert>
@@ -216,7 +284,7 @@
     <update id="updateDept" parameterType="Dept">
         update sys_dept
         <set>
-            <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+            <if test="parentId != null and parentId != ''">parent_id = #{parentId},</if>
             <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
             <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
             <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
@@ -234,6 +302,47 @@
         where dept_id = #{deptId}
     </update>
 
+    <update id="updateDeptByOrganizationId" parameterType="Dept">
+        update sys_dept
+        <set>
+            <if test="parentId != null and parentId != ''">parent_id = #{parentId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+            <if test="leader != null">leader = #{leader},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="deptType != null">dept_type = #{deptType},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id = #{kingdeeOrgId},</if>
+            <if test="kingdeeOrgParentId != null and kingdeeOrgParentId != ''">kingdee_org_parent_id = #{kingdeeOrgParentId},</if>
+            <if test="organizationId != null and organizationId != ''">organizationId = #{organizationId},</if>
+            <if test="organizationParentId != null and organizationParentId != ''">organizationParentId = #{organizationParentId},</if>
+            <if test="zzLevel != null and zzLevel != ''">zzLevel = #{zzLevel},</if>
+            <if test="code != null and code != ''">code = #{code},</if>
+            <if test="mappingUnitParentId != null and mappingUnitParentId != ''">mappingUnitParentId = #{mappingUnitParentId},</if>
+            <if test="updateAt != null and updateAt != ''">updateAt = #{updateAt},</if>
+            <if test="createAt != null and createAt != ''">createAt = #{createAt},</if>
+            <if test="description != null and description != ''">description = #{description},</if>
+            <if test="effectOn != null and effectOn != ''">effectOn = #{effectOn},</if>
+            <if test="sequence != null and sequence != ''">sequence = #{sequence},</if>
+            <if test="isDeleted != null and isDeleted != ''">isDeleted = #{isDeleted},</if>
+            <if test="zzDisplayPath != null and zzDisplayPath != ''">zzDisplayPath = #{zzDisplayPath},</if>
+            <if test="name != null and name != ''">`name` = #{name},</if>
+            <if test="guid != null and guid != ''">guid = #{guid},</if>
+            <if test="zzIsLeaf != null and zzIsLeaf != ''">zzIsLeaf = #{zzIsLeaf},</if>
+            <if test="isDisabled != null and isDisabled != ''">isDisabled = #{isDisabled},</if>
+            <if test="fullname != null and fullname != ''">fullname = #{fullname},</if>
+            <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>
+            update_time = sysdate()
+        </set>
+        where organizationId = #{organizationId}
+    </update>
+
     <update id="updateDeptChildren" parameterType="java.util.List">
         update sys_dept set ancestors =
         <foreach collection="depts" item="item" index="index"
@@ -268,7 +377,7 @@
     <select id="selectDeptListHole" parameterType="Dept" resultMap="DeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-        <if test="deptId != null and deptId != 0">
+        <if test="deptId != null and deptId != ''">
             AND find_in_set(#{deptId}, ancestors)
         </if>
     </select>

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

@@ -39,6 +39,8 @@
         <result property="updateAt" column="updateAt"/>
         <result property="guid" column="guid"/>
         <result property="mobileNumber" column="mobileNumber"/>
+        <result property="certificateTypeId" column="certificateTypeId"/>
+        <result property="certificateTypeIdCode" column="certificateTypeIdCode"/>
         <result property="certificateNumber" column="certificateNumber"/>
         <result property="srzUserid" column="srzUserid"/>
         <result property="isMappingPerson" column="isMappingPerson"/>
@@ -339,6 +341,8 @@
             <if test="updateAt != null and updateAt != ''">updateAt = #{updateAt},</if>
             <if test="guid != null and guid != ''">guid = #{guid},</if>
             <if test="mobileNumber != null and mobileNumber != ''">mobileNumber = #{mobileNumber},</if>
+            <if test="certificateTypeId != null and certificateTypeId != ''">certificateTypeId = #{certificateTypeId},</if>
+            <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">certificateTypeIdCode = #{certificateTypeIdCode},</if>
             <if test="certificateNumber != null and certificateNumber != ''">certificateNumber = #{certificateNumber},</if>
             <if test="srzUserid != null and srzUserid != ''">srzUserid = #{srzUserid},</if>
             <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson = #{isMappingPerson},</if>
@@ -407,6 +411,8 @@
         <if test="updateAt != null and updateAt != ''">updateAt,</if>
         <if test="guid != null and guid != ''">guid,</if>
         <if test="mobileNumber != null and mobileNumber != ''">mobileNumber,</if>
+        <if test="certificateTypeId != null and certificateTypeId != ''">certificateTypeId,</if>
+        <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">certificateTypeIdCode,</if>
         <if test="certificateNumber != null and certificateNumber != ''">certificateNumber,</if>
         <if test="srzUserid != null and srzUserid != ''">srzUserid,</if>
         <if test="isMappingPerson != null and isMappingPerson != ''">isMappingPerson,</if>
@@ -442,6 +448,8 @@
         <if test="updateAt != null and updateAt != ''">#{updateAt},</if>
         <if test="guid != null and guid != ''">#{guid},</if>
         <if test="mobileNumber != null and mobileNumber != ''">#{mobileNumber},</if>
+        <if test="certificateTypeId != null and certificateTypeId != ''">#{certificateTypeId},</if>
+        <if test="certificateTypeIdCode != null and certificateTypeIdCode != ''">#{certificateTypeIdCode},</if>
         <if test="certificateNumber != null and certificateNumber != ''">#{certificateNumber},</if>
         <if test="srzUserid != null and srzUserid != ''">#{srzUserid},</if>
         <if test="isMappingPerson != null and isMappingPerson != ''">#{isMappingPerson},</if>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@@ -208,7 +208,7 @@ security:
 
 
 allowed:
-  servernames: 10.132.108.3,10.76.108.1,192.168.110.36,192.168.244.1,192.168.1.101,139.186.135.156,192.168.1.102,192.168.1.105,192.168.8.129,192.168.1.100,192.168.1.104,192.168.1.103,10.76.108.3,10.132.108.3
+  servernames: 10.132.108.3,10.76.108.1,192.168.110.36,192.168.244.1,192.168.1.101,139.186.135.156,192.168.1.102,192.168.1.105,192.168.8.129,192.168.1.100,192.168.1.104,192.168.1.103,10.76.108.3,10.132.108.3,192.168.1.106
 
 excel:
   export: true
@@ -234,6 +234,7 @@ siq:
 
 #深圳易平台对接密钥 测试环境
 szypt:
+  agentid: 1000067
   url: https://szytest.sz.gov.cn:30443/
   corpid: wwefa4043a6b5cf4f3
   corpsecret: qYf-NIgyRKG-5eybrclvnBogATPfOhpnAVp6yBas7RU

lib/EmergencyService/zdxtEmergencyDictService/src/main/java/com/zdxt/dict/service/DictService.java

@@ -67,7 +67,7 @@ public class DictService
     }
 
     // 递归获取部门
-    private String iterationDeptParent(Long deptId) {
+    private String iterationDeptParent(String deptId) {
         DeptApi deptApi = SpringUtil.getBean(DeptApi.class);
         DeptBean dept = deptApi.getDeptById(deptId);
         Optional op =Optional.ofNullable(dept);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ThirdLoginService.java

@@ -12,6 +12,7 @@ public interface ThirdLoginService {
      * 深i企登录
      */
      ZDResponse siqLogin(JSONObject jsonObject);
+     ZDResponse szyLogin(String loginUser);
 
     /**
      * 添加深i企用户

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -2,7 +2,9 @@ package com.zdxt.code.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.dto.UserBean;
+import com.zdxt.auth.feign.DeptApi;
 import com.zdxt.auth.feign.UserApi;
 import com.zdxt.auth.framework.shiro.nopaddword.LoginType;
 import com.zdxt.auth.framework.shiro.nopaddword.UserToken;
@@ -44,6 +46,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
 
     @Autowired
     private UserApi userApi;
+    @Autowired
+    private DeptApi deptApi;
 
     @Autowired
     private IEnterpriseInformationService enterpriseInformationService;
@@ -67,6 +71,26 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         return null;
     }
 
+    @Override
+    public ZDResponse szyLogin(String loginUser) {
+        try {
+            //查询登录用户
+            UserBean user = userApi.getUserByUserLoginName(loginUser);
+            //本系统令牌
+//            UsernamePasswordToken sysToken = new UsernamePasswordToken(user.getLoginName(), user.getPassword(), false);
+            UserToken sysToken = new UserToken(user.getLoginName(), LoginType.NOPASSWD);
+            Subject subject = SecurityUtils.getSubject();
+            subject.login(sysToken);
+            DeptBean dept = deptApi.getDeptById(user.getOrganizationId());
+            user.setDept(dept);
+            user.setDeptId(user.getOrganizationId());
+            return ZDResponse.success("登录成功",user);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     @Override
     public Long addSiqUser(JSONObject jsonObject) {
         if(UserConstants.USER_NAME_UNIQUE.equals(userApi.checkLoginNameUnique(jsonObject.getString("account")))){
@@ -85,7 +109,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             userBean.setCreateTime(DateUtils.getNowDate());
 //                userBean.setUserId(Long.valueOf(userId));
             //部门ID设置为默认值
-            userBean.setDeptId(405L);
+            userBean.setDeptId("405");
 
             return userApi.insertUserResId(userBean);
         }

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

@@ -37,13 +37,13 @@ public class DeptBean implements Serializable {
      * 部门ID
      */
     @ApiModelProperty("部门ID")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 父部门ID
      */
     @ApiModelProperty("父部门ID")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 祖级列表
@@ -108,7 +108,7 @@ public class DeptBean implements Serializable {
      * 所属机构
      */
     @ApiModelProperty("所属机构ID")
-    private Long organizationId;
+    private String organizationId;
 
     /**
      * 搜索值
@@ -151,19 +151,19 @@ public class DeptBean implements Serializable {
      */
     private Map<String, Object> params;
 
-    public Long getDeptId() {
+    public String getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId) {
+    public void setDeptId(String deptId) {
         this.deptId = deptId;
     }
 
-    public Long getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Long parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
@@ -303,11 +303,11 @@ public class DeptBean implements Serializable {
         this.organization = organization;
     }
 
-    public Long getOrganizationId() {
+    public String getOrganizationId() {
         return organizationId;
     }
 
-    public void setOrganizationId(Long organizationId) {
+    public void setOrganizationId(String organizationId) {
         this.organizationId = organizationId;
     }
 

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

@@ -34,13 +34,13 @@ public class UserBean implements Serializable {
      * 部门ID
      */
     @ApiModelProperty("部门ID")
-    private Long deptId;
+    private String deptId;
 
     /**
      * 部门父ID
      */
     @ApiModelProperty("部门父ID")
-    private Long parentId;
+    private String parentId;
 
     /**
      * 角色ID
@@ -122,6 +122,10 @@ public class UserBean implements Serializable {
 
 
 
+
+
+    /** 部门id */
+    private String organizationId;
     /** 姓名 */
     private String fullname;
     /** 任务ID */
@@ -131,9 +135,9 @@ public class UserBean implements Serializable {
     /** 作用点 (CREATE：新建；UPDATE：更新；DELETED：删除；ENABLED：启用；DISABLED：禁用) */
     private String effectOn;
     /** 是否删除 (0否;1是)*/
-    private int isDeleted;
+    private String isDeleted;
     /** 是否禁用 (0否;1是)*/
-    private int isDisabled;
+    private String isDisabled;
     /** 创建日期 */
     private String createAt;
     /** 更新日期 */
@@ -142,6 +146,10 @@ public class UserBean implements Serializable {
     private String guid;
     /** 手机号 */
     private String mobileNumber;
+    /** 证件类型 */
+    private String certificateTypeId;
+    /** 证件类型代码 */
+    private String certificateTypeIdCode;
     /** 证件号码 */
     private String certificateNumber;
     /** 省认证用户id */
@@ -151,6 +159,38 @@ public class UserBean implements Serializable {
     /** 人员所在部门（包括主岗和兼岗部门） */
     private String units;
 
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public void setIsDisabled(String isDisabled) {
+        this.isDisabled = isDisabled;
+    }
+
+    public String getCertificateTypeId() {
+        return certificateTypeId;
+    }
+
+    public void setCertificateTypeId(String certificateTypeId) {
+        this.certificateTypeId = certificateTypeId;
+    }
+
+    public String getCertificateTypeIdCode() {
+        return certificateTypeIdCode;
+    }
+
+    public void setCertificateTypeIdCode(String certificateTypeIdCode) {
+        this.certificateTypeIdCode = certificateTypeIdCode;
+    }
+
     public Long getUserId() {
         return userId;
     }
@@ -159,19 +199,19 @@ public class UserBean implements Serializable {
         this.userId = userId;
     }
 
-    public Long getDeptId() {
+    public String getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId) {
+    public void setDeptId(String deptId) {
         this.deptId = deptId;
     }
 
-    public Long getParentId() {
+    public String getParentId() {
         return parentId;
     }
 
-    public void setParentId(Long parentId) {
+    public void setParentId(String parentId) {
         this.parentId = parentId;
     }
 
@@ -366,22 +406,14 @@ public class UserBean implements Serializable {
         this.effectOn = effectOn;
     }
 
-    public int getIsDeleted() {
+    public String getIsDeleted() {
         return isDeleted;
     }
 
-    public void setIsDeleted(int isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public int getIsDisabled() {
+    public String getIsDisabled() {
         return isDisabled;
     }
 
-    public void setIsDisabled(int isDisabled) {
-        this.isDisabled = isDisabled;
-    }
-
     public String getCreateAt() {
         return createAt;
     }

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

@@ -40,7 +40,7 @@ public interface DeptApi {
      */
     @ApiOperation(value = "获取数据字典")
     @GetMapping("/getChildrenDeptById")
-    public List<DeptBean> getChildrenDeptById(Long deptId);
+    public List<DeptBean> getChildrenDeptById(String deptId);
 
     /**
      * 根据部门类型(in语句)，获取所有子部门，id必须传
@@ -50,7 +50,7 @@ public interface DeptApi {
      */
     @ApiOperation(value = "根据部门类型(in语句)，获取所有子部门，id必须传")
     @GetMapping("/getChildrenDeptByIdAndInDeptType")
-    public List<DeptBean> getChildrenDeptByIdAndInDeptType(Long deptId, String[] deptTypes);
+    public List<DeptBean> getChildrenDeptByIdAndInDeptType(String deptId, String[] deptTypes);
 
     /**
      * 根据条件获取所有子部门，id必须传
@@ -81,7 +81,7 @@ public interface DeptApi {
      */
     @ApiOperation(value = "根据部门id获取该条数据")
     @GetMapping("/getDeptById")
-    public DeptBean getDeptById(Long deptId);
+    public DeptBean getDeptById(String deptId);
 
     @ApiOperation(value = "获取部门(加权限)")
     @GetMapping("/selectDeptTreePower")
@@ -93,11 +93,11 @@ public interface DeptApi {
 
     @PostMapping("/insertDept")
     @ApiOperation("新增部门")
-    public Long insertDept(DeptBean deptBean);
+    public String insertDept(DeptBean deptBean);
 
     @PostMapping("/updateDept")
     @ApiOperation("修改部门")
-    public Long updateDept(DeptBean deptBean);
+    public String updateDept(DeptBean deptBean);
 
     @PostMapping("/selectDeptListHole")
     @ApiOperation("根据部门信息获取当前及一下所有部门")

lib/ZdxtComponent/zdxtFlowComponent/src/main/java/com/zdxt/flow/common/IOrganizationApi.java

@@ -17,14 +17,14 @@ public interface IOrganizationApi {
      * @return
      */
 //    List<Ztree> getOrganizationData();
-    List<Map<String, Object>> getOrganizationData(Long deptId);
+    List<Map<String, Object>> getOrganizationData(String deptId);
 
     /**
      *
      * @param deptId
      * @return
      */
-    List<Map<String, Object>> getOrganizationUserData(Long deptId);
+    List<Map<String, Object>> getOrganizationUserData(String deptId);
 
     /**
      * 獲取部門

lib/ZdxtComponent/zdxtFlowComponent/src/main/java/com/zdxt/flow/controller/OrganizationController.java

@@ -33,15 +33,15 @@ public class OrganizationController {
      */
     @RequestMapping("/organizationTree")
     @ResponseBody
-    public List<Map<String, Object>> test(Long deptId){
+    public List<Map<String, Object>> test(String deptId){
         List<Map<String, Object>> ztreeList = iOrganizationApi.getOrganizationData(deptId);
         return ztreeList;
     }
     @RequestMapping("/userListTree")
     @ResponseBody
-    public List<Map<String, Object>> testUser(Long deptId,Long organId,String id){
+    public List<Map<String, Object>> testUser(String deptId,String organId,String id){
         if(!StringUtils.isEmpty(id)){
-            organId = Long.parseLong(id);
+            organId = id;
         }
         List<Map<String, Object>> ztreeList = iOrganizationApi.getOrganizationUserData(organId);
         return ztreeList;