Merge branch 'develop_master' into FOTON

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

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<>();