From 153f193a391d65bedc3feeec86d783eacdbd520e Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 28 Feb 2024 23:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=AE=E6=94=B9=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=8E=BB=E6=8E=89=E7=88=B6=E7=BA=A7=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrganizationController.java    | 41 ------------
 .../organization/OrganizationService.java     | 62 +------------------
 2 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java
index 2b7a2ffd..236fef55 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/OrganizationController.java
@@ -123,45 +123,4 @@ public class OrganizationController {
         }
         return arr;
     }
-
-    /**
-     * create by: cjl
-     * description:
-     *  新增机构信息
-     * create time: 2019/2/19 17:17
-     * @Param: beanJson
-     * @return java.lang.Object
-     */
-    @PostMapping(value = "/addOrganization")
-    @ApiOperation(value = "新增机构信息")
-    public Object addOrganization(@RequestParam("info") String beanJson) throws Exception {
-        JSONObject result = ExceptionConstants.standardSuccess();
-        Organization org= JSON.parseObject(beanJson, Organization.class);
-        int i= organizationService.addOrganization(org);
-        if(i<1){
-            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_ADD_FAILED_CODE,
-                    ExceptionConstants.ORGANIZATION_ADD_FAILED_MSG);
-        }
-        return result;
-    }
-    /**
-     * create by: cjl
-     * description:
-     *  修改机构信息
-     * create time: 2019/2/20 9:30
-     * @Param: beanJson
-     * @return java.lang.Object
-     */
-    @PostMapping(value = "/editOrganization")
-    @ApiOperation(value = "修改机构信息")
-    public Object editOrganization(@RequestParam("info") String beanJson) throws Exception {
-        JSONObject result = ExceptionConstants.standardSuccess();
-        Organization org= JSON.parseObject(beanJson, Organization.class);
-        int i= organizationService.editOrganization(org);
-        if(i<1){
-            throw new BusinessRunTimeException(ExceptionConstants.ORGANIZATION_EDIT_FAILED_CODE,
-                    ExceptionConstants.ORGANIZATION_EDIT_FAILED_MSG);
-        }
-        return result;
-    }
 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
index df700b51..09dd15fb 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
@@ -85,7 +85,7 @@ public class OrganizationService {
         organization.setUpdateTime(new Date());
         int result=0;
         try{
-            result=organizationMapper.updateByPrimaryKeySelective(organization);
+            result=organizationMapperEx.editOrganization(organization);
             logService.insertLog("机构",
                     new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(organization.getOrgAbr()).toString(), request);
         }catch(Exception e){
@@ -143,66 +143,6 @@ public class OrganizationService {
         return list==null?0:list.size();
     }
 
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int addOrganization(Organization org) throws Exception{
-        logService.insertLog("机构",
-                new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(org.getOrgAbr()).toString(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        //新增时间
-        Date date=new Date();
-        User userInfo=userService.getCurrentUser();
-        org.setCreateTime(date);
-        //修改时间
-        org.setUpdateTime(date);
-        /**
-         *添加的时候检测机构编号是否已存在
-         * */
-        if(StringUtil.isNotEmpty(org.getOrgNo())){
-            checkOrgNoIsExists(org.getOrgNo(),null);
-        }
-        /**
-         * 未指定父级机构的时候默认为根机构
-         * */
-        if(org.getParentId()!=null){
-            org.setParentId(null);
-        }
-        int result=0;
-        try{
-            result=organizationMapperEx.addOrganization(org);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-    @Transactional(value = "transactionManager", rollbackFor = Exception.class)
-    public int editOrganization(Organization org)throws Exception {
-        logService.insertLog("机构",
-               new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(org.getOrgAbr()).toString(),
-                ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-        //修改时间
-        org.setUpdateTime(new Date());
-        User userInfo=userService.getCurrentUser();
-        /**
-         * 修改的时候检测机构编号是否已存在
-         * */
-        if(StringUtil.isNotEmpty(org.getOrgNo())){
-            checkOrgNoIsExists(org.getOrgNo(),org.getId());
-        }
-        /**
-         * 未指定父级机构的时候默认为根机构
-         * */
-        if(org.getParentId()!=null){
-            org.setParentId(null);
-        }
-        int result=0;
-        try{
-            result=organizationMapperEx.editOrganization(org);
-        }catch(Exception e){
-            JshException.writeFail(logger, e);
-        }
-        return result;
-    }
-
     public List<TreeNode> getOrganizationTree(Long id)throws Exception {
         List<TreeNode> list=null;
         try{