diff --git a/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java b/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java index b037f963..ae5c5096 100644 --- a/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java +++ b/servers/org-user-sync/src/main/java/com/xboe/StartRunner.java @@ -84,6 +84,11 @@ public class StartRunner implements ApplicationRunner { if(oldUser.getIsDeleted()!=null) { mainUser.setDeleted(oldUser.getIsDeleted()==0? false:true); } + if(mainUser.getDeleted()) { + if(StringUtils.isNotBlank(oldUser.getEmployeeStatus())){ + mainUser.setDeleted(oldUser.getEmployeeStatus().equals("3")? true:false); + } + } mainService.updateUser(mainUser); } }else { diff --git a/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldTreeNode.java b/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldTreeNode.java index 732fc49f..083c86b6 100644 --- a/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldTreeNode.java +++ b/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldTreeNode.java @@ -21,12 +21,23 @@ public class OldTreeNode { @Column(name = "kid", length = 36) private String kid; + @Column(name = "tree_node_code", length = 50) + private String nodeCode; + @Column(name = "tree_node_name", length = 100) private String nodeName; + @Column(name = "display_number") + private Integer displayNumber; + + + @Column(name = "node_name_path", length = 500) private String namePath; + @Column(name = "parent_node_id", length = 50) + private String parentNodeId; + @Column(name = "is_deleted", length = 1) private Integer isDeleted; } diff --git a/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldUser.java b/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldUser.java index 3c2f50bd..6c78ba00 100644 --- a/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldUser.java +++ b/servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldUser.java @@ -31,6 +31,11 @@ public class OldUser implements java.io.Serializable{ */ @Column(name = "user_no", length = 90) private String userNo; + + + + @Column(name = "employee_status", length = 50) + private String employeeStatus; /**