From 85d5098d0d3076ca312fb298f13b5e1a51967ff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?=
 <852955+jishenghua@users.noreply.gitee.com>
Date: Wed, 13 Mar 2019 22:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=A4=9A=E6=A0=B9=E7=9B=AE=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=85=A8=E9=83=A8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/organization.html        | 20 +++++++++-------
 .../jsh/erp/constants/BusinessConstants.java  |  4 ++--
 .../organization/OrganizationService.java     | 24 ++-----------------
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html
index ef724ee0..60f8ec8b 100644
--- a/erp_web/pages/manage/organization.html
+++ b/erp_web/pages/manage/organization.html
@@ -54,13 +54,6 @@
                            data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
                 </td>
             </tr>
-            <!--<tr>
-                <td>类型</td>
-                <td style="padding:5px">
-                    <input name="orgTpcd" id="orgTpcd" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
-                </td>
-            </tr>-->
             <tr>
                 <td>状态</td>
                 <td style="padding:5px">
@@ -75,7 +68,8 @@
             <tr>
                 <td>编号</td>
                 <td style="padding:5px">
-                    <input name="orgNo" id="orgNo"  style="width: 200px;height: 20px"/>
+                    <input name="orgNo" id="orgNo" class="easyui-validatebox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
                 </td>
             </tr>
             <tr>
@@ -270,8 +264,16 @@
 
     //保存信息
     $("#saveOrganization").off("click").on("click", function () {
+        if (!$("#orgFullName").val()) {
+            $.messager.alert('提示', '全称不能为空！', 'warning');
+            return;
+        }
         if (!$("#orgAbr").val()) {
-            $.messager.alert('提示', '机构名称不能为空！', 'warning');
+            $.messager.alert('提示', '简称不能为空！', 'warning');
+            return;
+        }
+        if (!$("#orgNo").val()) {
+            $.messager.alert('提示', '编号不能为空！', 'warning');
             return;
         }
         var objInfo = $("#organizationFM").serializeObject();
diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index e9fb5f21..8e4f3e7b 100644
--- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -102,9 +102,9 @@ public class BusinessConstants {
     public static final String ORGANIZATION_STCD_REMOVED = "5";
     /**
      * 根机构编号
-     * 根机构编号默认为01
+     * 根机构编号默认为-1
      * */
-    public static final String ORGANIZATION_ROOT_NO = "01";
+    public static final String ORGANIZATION_ROOT_NO = "-1";
     /**
      * 新增用户默认密码
      * */
diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
index 256898c9..e21f5cfc 100644
--- a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
+++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
@@ -79,7 +79,7 @@ public class OrganizationService {
             checkOrgNoIsExists(org.getOrgNo(),null);
         }
         /**
-         * 未指定父级机构的时候默认放在根机构下
+         * 未指定父级机构的时候默认为根机构
          * */
         if(StringUtil.isEmpty(org.getOrgParentNo())){
             org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO);
@@ -100,20 +100,11 @@ public class OrganizationService {
             checkOrgNoIsExists(org.getOrgNo(),org.getId());
         }
         /**
-         * 未指定父级机构的时候默认放在根机构下
+         * 未指定父级机构的时候默认为根机构
          * */
         if(StringUtil.isEmpty(org.getOrgParentNo())){
             org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO);
         }
-        /**
-         * 添加一个限制，根机构不允许修改
-         * */
-        if(BusinessConstants.ORGANIZATION_ROOT_NO.equals(org.getOrgNo())){
-            logger.error("异常码[{}],异常提示[{}],参数,orgNo[{}]",
-                    ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_CODE,ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_MSG,org.getOrgNo());
-            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_CODE,
-                    ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_EDIT_MSG);
-        }
         return organizationMapperEx.editOrganization(org);
     }
 
@@ -172,17 +163,6 @@ public class OrganizationService {
     public int batchDeleteOrganizationByIds(String ids) throws Exception{
         User userInfo=userService.getCurrentUser();
         String [] idArray=ids.split(",");
-        /**
-         * 添加一个限制，根机构不允许删除
-         * */
-        List<Organization> orgRootList=organizationMapperEx.getOrganizationRootByIds(idArray);
-        if(orgRootList!=null&&orgRootList.size()>0){
-            logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
-                    ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_CODE,ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_MSG,ids);
-            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_CODE,
-                    ExceptionConstants.ORGANIZATION_ROOT_NOT_ALLOWED_DELETE_MSG);
-        }
-
         return organizationMapperEx.batchDeleteOrganizationByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
     }
 }