src/com/api/browser/service/impl/JobBrowserService.java

@@ -130,7 +130,7 @@ public class JobBrowserService extends BrowserService {
         // 分权
         DetachUtil detachUtil = new DetachUtil(user);
         if (detachUtil.isDETACH()) {
-            sqlWhere += "  AND t.parent_comp  in (" + detachUtil.getJclRoleLevels() + ")";
+            sqlWhere += "  AND t.ec_company  in (" + detachUtil.getJclRoleLevels() + ")";
         }
         return sqlWhere;
     }

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -159,7 +159,7 @@ public class DepartmentBO {
             return "";
         }
         String departmentPrincipal = MapperProxyFactory.getProxy(DepartmentMapper.class).getDepartmentPrincipal(id);
-        if (StringUtils.isBlank(departmentPrincipal)) {
+        if (StringUtils.isBlank(departmentPrincipal) || "$NULL$".equalsIgnoreCase(departmentPrincipal)) {
             return "";
         }
         List<Long> collect = Arrays.stream(departmentPrincipal.split(",")).map(Long::parseLong).collect(Collectors.toList());

src/com/engine/organization/util/saveimport/CompanyImport.java

@@ -195,8 +195,10 @@ public class CompanyImport {
                     try {
                         if ("subcompanyname".equalsIgnoreCase(infoPO.getFieldName())) {
                             reallyValue = cellValue;
+                        } else if (StringUtils.isBlank(cellValue)) {
+                            reallyValue = "";
                         } else {
-                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
+                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
                         }
                     } catch (Exception e) {
                         historyDetailPO.setOperateDetail(cellValue + "转换失败");

src/com/engine/organization/util/saveimport/DepartmentImport.java

@@ -206,8 +206,10 @@ public class DepartmentImport {
                     try {
                         if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) {
                             reallyValue = cellValue;
+                        } else if (StringUtils.isBlank(cellValue)) {
+                            reallyValue = "";
                         } else {
-                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
+                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
                         }
                     } catch (Exception e) {
                         historyDetailPO.setOperateDetail(cellValue + "转换失败");