学习资料代码提交,机构表字段删减

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysLearningMaterialsServiceImpl.java

@@ -61,6 +61,9 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
 
     private void dealParentOrgId(SysLearningMaterialsPageDto sysLearningMaterials) {
         SysOrg sysOrg = orgService.selectSysOrgById(sysLearningMaterials.getOrgId());
+        if (sysOrg == null || ObjectUtil.isEmpty(sysOrg.getPath())) {
+            return;
+        }
         String[] split = sysOrg.getPath().split("-");
         List<Long> list = new ArrayList<>();
         Stream.of(split).forEach(s -> list.add(Long.valueOf(s)));

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -29,7 +29,7 @@
     </resultMap>
 
     <sql id="selectSysOrgVo">
-        select id, address, code, device_count, guid, is_lock, manager, manager_phone, name, parent_id, phone, city_code, open_year, fit_year, floorage, employee, is_own_right, is_rent, is_only, build_year, place_type, build_height, social, natural_envir, type, create_time, modified_name, update_time, modified_id, path, vid, level, oid, parent_guid, deleted, sort, location, create_by, update_by
+        select id, address, code, guid, is_lock, manager, manager_phone, name, parent_id, phone, city_code , type, create_time, update_time, parent_guid, deleted, sort,  create_by, update_by,weather_city_code,org_extend_id,source
         from sys_org
     </sql>