提交同步程序的修改

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 {

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;
 }

servers/org-user-sync/src/main/java/com/xboe/basic/entity/OldUser.java

@@ -33,6 +33,11 @@ public class OldUser implements java.io.Serializable{
     private String userNo;
     
     
+    
+    @Column(name = "employee_status", length = 50)
+    private String employeeStatus;
+
+   
     /**
      * 状态；0：临时，1：正常，2：停用
      */