Merge remote-tracking branch 'origin/dev' into dev

server-common/src/main/java/com/makeit/config/mybatis/tenant/DataScopeInterceptor.java

@@ -55,9 +55,10 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte
         }
         }
         String[] orgIds = dataScope.split(Const.COMMON_SPLIT);
         String[] orgIds = dataScope.split(Const.COMMON_SPLIT);
         List<String> orgIdList = Arrays.asList(orgIds);
         List<String> orgIdList = Arrays.asList(orgIds);
-        if(orgIdList.contains(tenantId)){
-            return;
-        }
+        //2023年10月10日 如果是租户级别的组织，也只能看到本层
+//        if(orgIdList.contains(tenantId)){
+//            return;
+//        }
         String tableName = ((Table) ((PlainSelect) select.getSelectBody()).getFromItem()).getName();
         String tableName = ((Table) ((PlainSelect) select.getSelectBody()).getFromItem()).getName();
         //没有org_id 表字段跳过
         //没有org_id 表字段跳过
             List<TableFieldInfo> fieldInfoList = TableInfoHelper.getTableInfo(tableName).getFieldList();
             List<TableFieldInfo> fieldInfoList = TableInfoHelper.getTableInfo(tableName).getFieldList();

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -268,7 +268,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
     @Transactional
     @Transactional
     @Override
     @Override
     public void edit(PlatUserDTOVO dto) {
     public void edit(PlatUserDTOVO dto) {
-        dto.setAccount(null);
+        //dto.setAccount(null);
         check(dto);
         check(dto);
         PlatUser user = BeanDtoVoUtils.convert(dto, PlatUser.class);
         PlatUser user = BeanDtoVoUtils.convert(dto, PlatUser.class);
         user.setIsTenant(CommonEnum.YES.getValue());
         user.setIsTenant(CommonEnum.YES.getValue());