diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs
index ac26c1139..0ca9a1926 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Company/CompanyService.cs
@@ -53,7 +53,8 @@ namespace Learun.Application.Organization
t.F_Photo,
t.F_BriefIntroduction,
t.F_EnrollmentInformation,
- t.F_ModifyUserName
+ t.F_ModifyUserName,
+ T.F_USCreditCode
";
}
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs
index 045da684c..6475a40f4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs
@@ -131,6 +131,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
list = list.Where(m => m.F_CompanyId != keyValue).ToList();
}
+ if (keyValue == entity.F_ParentId)
+ {
+ return Fail("操作失败,当前项不允许");
+ }
+
if (list.Any(a => a.F_FullName == entity.F_FullName))
{
return Fail("学校名称重复");
@@ -157,8 +162,16 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
[AjaxOnly]
public ActionResult DeleteForm(string keyValue)
{
- companyIBLL.VirtualDelete(keyValue);
- return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, "");
+ var list = companyIBLL.GetList().Where(x => x.F_ParentId == keyValue && x.F_EnabledMark == 1 && x.F_DeleteMark == 0);
+ if (list.Count() > 0)
+ {
+ return Fail("删除失败！拥有下辖项不可直接删除");
+ }
+ else
+ {
+ companyIBLL.VirtualDelete(keyValue);
+ return Success("删除成功！", "公司信息", OperationType.Delete, keyValue, "");
+ }
}
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml
index 6a78c3355..877361cf1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml
@@ -20,12 +20,12 @@
-