hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-06 17:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
daihh
2022-10-19 16:43:58 +08:00
parent 0dd9e19333
commit 30a6e891fb
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/boe-server-basic/src/main/java/com/xboe/basic/entity/OrgTree.java
View File

@@ -21,7 +21,7 @@ public class OrgTree extends IdEntity {
/**
* 机构id
* */
@Column(name = "org_id",length = 18)
@Column(name = "org_id",length = 20)
private String orgId;
/**
@@ -30,6 +30,12 @@ public class OrgTree extends IdEntity {
@Column(name = "parent_id",length = 36)
private String parentId;
/**
* 原系统的上级id
*/
@Column(name = "old_parent_id",length = 36)
private String oldParentId;
/**
* 体系标识
* */

2
servers/boe-server-basic/src/main/java/com/xboe/basic/entity/User.java
View File

@@ -120,7 +120,7 @@ public class User extends IdEntity {
private String domainId;
/**
* 扩展字段，多租户系统的标识值
* 扩展字段，多租户系统的标识值，原系统的companyId
*/
@Column(name = "sass_id", length = 36)
private String sassId;

12
servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java
View File

@@ -28,7 +28,9 @@ import com.xboe.core.orm.QueryBuilder;
import com.xboe.dto.OrganizationDto;
import com.xboe.dto.UserDto;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service("basicService")
public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
@@ -58,7 +60,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
if(org==null) {//新增加
org=new Organization();
org.setId(IDGenerator.generate());
org.setKid(dto.getKid());
org.setKid(dto.getKid());//老系统的id
org.setCode(org.getCode());
org.setCreateFrom(dto.getCreateFrom());
@@ -87,6 +89,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
treeNode.setTreeType(dto.getTreeType());
treeNode.setParentId("");
treeNode.setRemark("系统同步");
treeNode.setOldParentId(dto.getParentId());//保原机构的父id
if(StringUtils.isNotBlank(dto.getParentId())){
//检查它的上级id是哪个
String parentId=(String)orgDao.findField("id",FieldFilters.eq("kid",dto.getParentId()));
@@ -94,6 +97,10 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
if(StringUtils.isNotBlank(parentId)){
treeNode.setParentId(parentId);
dto.setParentId(parentId);//设置dto的parentId;
}else {
//这种情况，本地无机构,应该去远程获取
log.error("本地未找到机构【"+dto.getKid()+"】的上级parentId【"+dto.getParentId()+"】对应的机构，机构新id【"+org.getId()+"】");
dto.setParentId("-1");//如果没有情况，设置为-1
}
}
orgTreeDao.save(treeNode);
@@ -103,6 +110,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
// org.setCreateFrom(dto.getCreateFrom());
// org.setCreateTime(dto.getCreateTime());
// org.setDataFrom(dto.getDataFrom());
//已经删除的，需要还原，因为新的同步过来了
if(dto.getDeleted()!=null && dto.getDeleted()) {
org.setDeleted(dto.getDeleted());
}
@@ -112,7 +120,6 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
org.setIsServiceSite(dto.getIsServiceSite());
org.setName(dto.getName());
org.setNamePath(dto.getNamePath());
//org.setOrganizationLevel(dto.getSysLevel());
org.setSysLevel(dto.getSysLevel());
org.setRemark(dto.getRemark());
org.setSassId(dto.getSassId());
@@ -130,6 +137,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{
dto.setParentId(parentId);
if(treeNode!=null){
treeNode.setParentId(parentId);
treeNode.setOldParentId(dto.getParentId());
orgTreeDao.update(treeNode);
}else {
treeNode=new OrgTree();

2
servers/boe-server-basic/src/main/java/com/xboe/primary/entity/MainOrganization.java
View File

@@ -53,7 +53,7 @@ public class MainOrganization extends BaseEntity {
/**
* 父组织部门ID
*/
@Column(name = "parent_id", length = 18)
@Column(name = "parent_id", length = 20)
private String parentId;
/**