From 8372b5f4159273858edbc20fa57b17568f7b0720 Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Wed, 8 Jun 2022 13:37:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/DataSync/service/impl/DataSyncServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
index d52ad7ae..fd69cea1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
@@ -109,11 +109,11 @@ public class DataSyncServiceImpl implements IDataSyncService {
                         userEO.setInstitutionName(null!=jsonObject.getString("orgName")?jsonObject.getString("orgName"):"" );
                         //2022-05-23：用户同步增加状态标识，将停用的用户过滤掉
                         if("1".equals(jsonObject.getString("userStatus"))){
-                            userEO.setValidFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
-                            userEO.setDisableFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
-                        }else{
                             userEO.setValidFlag(ValidFlagEnum.VALID_TRUE.getValue()+"");
                             userEO.setDisableFlag(ValidFlagEnum.VALID_TRUE.getValue()+"");
+                        }else{
+                            userEO.setValidFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
+                            userEO.setDisableFlag(ValidFlagEnum.VALID_FALSE.getValue()+"");
                         }
                         if("ADD".equals(userState)){
                             addUserList.add(userEO);

From 4029ea18e2b3268b15a66961d03b7a9022db303c Mon Sep 17 00:00:00 2001
From: zhangyanduan <yanduan0908@hotmail.com>
Date: Wed, 8 Jun 2022 17:56:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E7=88=B6?=
 =?UTF-8?q?=E7=BA=A7ID=E9=9B=86=E5=90=88=E4=B8=AD=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=89=8D=E5=90=8E=E9=80=97=E5=8F=B7=E5=AF=BC=E8=87=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TsResourceServiceImpl.java            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
index a33ee6c0..f4448a6c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
@@ -322,6 +322,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
             }
         }
         TsResource.setValidFlag(0);
+        String pIds =TsResource.getParentIds();
+        if(StringUtils.isNotBlank(pIds)){
+            if(!pIds.startsWith(",")){
+                pIds = ","+pIds;
+            }
+            if(!pIds.endsWith(",")){
+                pIds = pIds+",";
+            }
+            TsResource.setParentIds(pIds);
+        }
         dao.insert(TsResource);
         // 把新生成的子目录加入用户的权限的下----插入ts_role_resource表
         HashMap<String, Object> map = new HashMap<>();