diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java index 23df4003..9161ae0e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java @@ -28,5 +28,6 @@ public interface OrganizationMapperEx { int batchDeleteOrganizationByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); int editOrganization(Organization org); + List getOrganizationRootByIds(@Param("ids") String ids[]); } 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 a9ca30e3..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 @@ -83,7 +83,6 @@ public class OrganizationService { public int updateOrganization(JSONObject obj, HttpServletRequest request)throws Exception { Organization organization = JSONObject.parseObject(obj.toJSONString(), Organization.class); organization.setUpdateTime(new Date()); - organization.setDeleteFlag("0"); int result=0; try{ result=organizationMapperEx.editOrganization(organization); diff --git a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml index 737cb140..4a65be1a 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/OrganizationMapperEx.xml @@ -84,8 +84,7 @@ update jsh_organization set update_time=#{updateTime}, org_no = #{orgNo},org_abr = #{orgAbr}, - delete_flag = #{deleteFlag},parent_id = #{parentId}, - sort = #{sort},remark = #{remark} + parent_id = #{parentId}, sort = #{sort},remark = #{remark} where id =#{id}