校区管理上级不允许选自己

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs

@@ -130,6 +130,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("学校名称重复");
@@ -156,8 +161,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
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml

@@ -36,7 +36,7 @@
         <div class="lr-form-item-title">电子邮箱</div>
         <input id="F_Email" type="text" class="form-control" isvalid="yes" checkexpession="EmailOrNull" />
     </div>
-    <div class="col-xs-6 lr-form-item">
+    <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">照片</div>
         <div id="F_Photo"></div>
     </div>