diff --git a/src/com/engine/organization/entity/comp/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java similarity index 68% rename from src/com/engine/organization/entity/comp/bo/CompBO.java rename to src/com/engine/organization/entity/company/bo/CompBO.java index a5a12f76..c8ea0946 100644 --- a/src/com/engine/organization/entity/comp/bo/CompBO.java +++ b/src/com/engine/organization/entity/company/bo/CompBO.java @@ -1,9 +1,9 @@ -package com.engine.organization.entity.comp.bo; +package com.engine.organization.entity.company.bo; import com.api.hrm.bean.TreeNode; -import com.engine.organization.entity.comp.dto.CompListDTO; -import com.engine.organization.entity.comp.param.CompSearchParam; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.dto.CompListDTO; +import com.engine.organization.entity.company.param.CompSearchParam; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.searchtree.SearchTree; import org.apache.commons.collections.CollectionUtils; import weaver.crm.Maint.SectorInfoComInfo; @@ -21,9 +21,9 @@ import java.util.stream.Collectors; */ public class CompBO { - public static List buildCompDTOList(Collection list) { + public static List buildCompDTOList(Collection list) { - Map poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item)); + Map poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item)); List dtoList = list.stream().map(e -> CompListDTO.builder().id(e.getId()).compNo(e.getCompNo()).compName(e.getCompName()).compNameShort(e.getCompNameShort()).parentCompany(e.getParentCompany()).parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()).orgCode(e.getOrgCode()).industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")).compPrincipal(getUserNameById(e.getCompPrincipal() + "")).forbiddenTag(e.getForbiddenTag()).build()).collect(Collectors.toList()); Map> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany)); @@ -33,15 +33,15 @@ public class CompBO { }).filter(item -> null == item.getParentCompany() || 0 == item.getParentCompany()).collect(Collectors.toList()); } - public static List buildCompDTOList(Collection list, List filterList) { + public static List buildCompDTOList(Collection list, List filterList) { // 搜索结果为空,直接返回空 if (CollectionUtils.isEmpty(filterList)) { return Collections.emptyList(); } // 递归添加父级数据 - Map poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item)); - List addedList = new ArrayList<>(); - for (CompPO po : filterList) { + Map poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item)); + List addedList = new ArrayList<>(); + for (com.engine.organization.entity.company.po.CompPO po : filterList) { dealParentData(addedList, po, poMaps); } @@ -53,15 +53,15 @@ public class CompBO { }).filter(item -> null == item.getParentCompany() || 0 == item.getParentCompany()).collect(Collectors.toList()); } - public static CompPO convertParamToPO(CompSearchParam param, Long employeeId) { + public static com.engine.organization.entity.company.po.CompPO convertParamToPO(CompSearchParam param, Long employeeId) { if (null == param) { return null; } - return CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build(); + return com.engine.organization.entity.company.po.CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build(); } - public static List buildSetToSearchTree(Set comps) { + public static List buildSetToSearchTree(Set comps) { return comps.stream().map(item -> { SearchTree tree = new SearchTree(); tree.setCanClick(true); @@ -85,7 +85,7 @@ public class CompBO { * @param po * @param poMaps */ - private static void dealParentData(List addedList, CompPO po, Map poMaps) { + private static void dealParentData(List addedList, com.engine.organization.entity.company.po.CompPO po, Map poMaps) { if (!addedList.contains(po)) { addedList.add(po); } diff --git a/src/com/engine/organization/entity/comp/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java similarity index 97% rename from src/com/engine/organization/entity/comp/dto/CompListDTO.java rename to src/com/engine/organization/entity/company/dto/CompListDTO.java index 963085aa..73e9e464 100644 --- a/src/com/engine/organization/entity/comp/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.comp.dto; +package com.engine.organization.entity.company.dto; import com.cloudstore.eccom.pc.table.WeaTableType; import com.engine.organization.annotation.OrganizationTable; diff --git a/src/com/engine/organization/entity/comp/param/CompSearchParam.java b/src/com/engine/organization/entity/company/param/CompSearchParam.java similarity index 94% rename from src/com/engine/organization/entity/comp/param/CompSearchParam.java rename to src/com/engine/organization/entity/company/param/CompSearchParam.java index 0010a515..1aa114cc 100644 --- a/src/com/engine/organization/entity/comp/param/CompSearchParam.java +++ b/src/com/engine/organization/entity/company/param/CompSearchParam.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.comp.param; +package com.engine.organization.entity.company.param; import com.engine.organization.common.BaseQueryParam; import lombok.AllArgsConstructor; diff --git a/src/com/engine/organization/entity/comp/po/CompPO.java b/src/com/engine/organization/entity/company/po/CompPO.java similarity index 95% rename from src/com/engine/organization/entity/comp/po/CompPO.java rename to src/com/engine/organization/entity/company/po/CompPO.java index 671b17fe..1acd4ab3 100644 --- a/src/com/engine/organization/entity/comp/po/CompPO.java +++ b/src/com/engine/organization/entity/company/po/CompPO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.comp.po; +package com.engine.organization.entity.company.po; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/com/engine/organization/entity/post/dto/PostDTO.java b/src/com/engine/organization/entity/postion/dto/PostDTO.java similarity index 88% rename from src/com/engine/organization/entity/post/dto/PostDTO.java rename to src/com/engine/organization/entity/postion/dto/PostDTO.java index 1285763b..c06fd8ac 100644 --- a/src/com/engine/organization/entity/post/dto/PostDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostDTO.java @@ -1,6 +1,6 @@ -package com.engine.organization.entity.post.dto; +package com.engine.organization.entity.postion.dto; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.po.PostPO; import java.util.Date; diff --git a/src/com/engine/organization/entity/post/dto/PostInfoDTO.java b/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java similarity index 88% rename from src/com/engine/organization/entity/post/dto/PostInfoDTO.java rename to src/com/engine/organization/entity/postion/dto/PostInfoDTO.java index 47bcde77..a21c6de3 100644 --- a/src/com/engine/organization/entity/post/dto/PostInfoDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostInfoDTO.java @@ -1,7 +1,7 @@ -package com.engine.organization.entity.post.dto; +package com.engine.organization.entity.postion.dto; -import com.engine.organization.entity.post.param.PostInfoSearchParam; -import com.engine.organization.entity.post.po.PostInfoPO; +import com.engine.organization.entity.postion.param.PostInfoSearchParam; +import com.engine.organization.entity.postion.po.PostInfoPO; import java.util.Date; diff --git a/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java similarity index 94% rename from src/com/engine/organization/entity/post/param/PostInfoSearchParam.java rename to src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java index 1a5bca15..fa309dff 100644 --- a/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java +++ b/src/com/engine/organization/entity/postion/param/PostInfoSearchParam.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.post.param; +package com.engine.organization.entity.postion.param; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/com/engine/organization/entity/post/po/PostInfoPO.java b/src/com/engine/organization/entity/postion/po/PostInfoPO.java similarity index 95% rename from src/com/engine/organization/entity/post/po/PostInfoPO.java rename to src/com/engine/organization/entity/postion/po/PostInfoPO.java index baf8c7d8..d780e7f3 100644 --- a/src/com/engine/organization/entity/post/po/PostInfoPO.java +++ b/src/com/engine/organization/entity/postion/po/PostInfoPO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.post.po; +package com.engine.organization.entity.postion.po; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/com/engine/organization/entity/post/po/PostPO.java b/src/com/engine/organization/entity/postion/po/PostPO.java similarity index 92% rename from src/com/engine/organization/entity/post/po/PostPO.java rename to src/com/engine/organization/entity/postion/po/PostPO.java index 91120587..0767a090 100644 --- a/src/com/engine/organization/entity/post/po/PostPO.java +++ b/src/com/engine/organization/entity/postion/po/PostPO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.post.po; +package com.engine.organization.entity.postion.po; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java similarity index 98% rename from src/com/engine/organization/entity/post/vo/PostInfoTableVO.java rename to src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java index 3bbc6ef7..62d6dc16 100644 --- a/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java @@ -1,4 +1,4 @@ -package com.engine.organization.entity.post.vo; +package com.engine.organization.entity.postion.vo; import com.engine.organization.annotation.OrganizationTable; import com.engine.organization.annotation.OrganizationTableColumn; diff --git a/src/com/engine/organization/mapper/comp/CompMapper.java b/src/com/engine/organization/mapper/comp/CompMapper.java index 48145ffe..f4b9f268 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.java +++ b/src/com/engine/organization/mapper/comp/CompMapper.java @@ -1,6 +1,6 @@ package com.engine.organization.mapper.comp; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.po.CompPO; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml index b5082822..ed03538d 100644 --- a/src/com/engine/organization/mapper/comp/CompMapper.xml +++ b/src/com/engine/organization/mapper/comp/CompMapper.xml @@ -1,7 +1,7 @@ - + @@ -50,7 +50,7 @@ and NVL(parent_company,'0')='0' - INSERT INTO jcl_org_comp @@ -171,12 +171,12 @@ and id = #{id} - select from jcl_org_comp t where comp_no = #{compNo} AND delete_type = 0 - SELECT FROM @@ -252,7 +252,7 @@ - + update jcl_org_comp creator=#{creator}, diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.java b/src/com/engine/organization/mapper/post/PostInfoMapper.java index f2b2d0d2..baca0ec0 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.java +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.java @@ -1,7 +1,7 @@ package com.engine.organization.mapper.post; -import com.engine.organization.entity.post.po.PostInfoPO; +import com.engine.organization.entity.postion.po.PostInfoPO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.xml b/src/com/engine/organization/mapper/post/PostInfoMapper.xml index be162ff4..10d12bf9 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.xml +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -35,14 +35,14 @@ , t.create_time , t.update_time - - - + update jcl_org_post_info creator=#{creator}, @@ -77,7 +77,7 @@ WHERE id = #{id} AND delete_type = 0 - INSERT INTO jcl_org_post_info @@ -154,7 +154,7 @@ - + update jcl_org_post_info forbidden_tag=#{forbiddenTag}, diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index 0a8e0d82..7132e17b 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -2,7 +2,7 @@ package com.engine.organization.mapper.post; import com.engine.organization.entity.TreeData; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.po.PostPO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml index 8ab5d466..3604960f 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.xml +++ b/src/com/engine/organization/mapper/post/PostMapper.xml @@ -1,7 +1,7 @@ - + @@ -30,14 +30,14 @@ , t.create_time , t.update_time - - select from jcl_org_post t where post_no = #{postNo} AND delete_type = 0 @@ -61,7 +61,7 @@ select id , post_name from jcl_org_post where delete_type ='0' - + update jcl_org_post creator=#{creator}, @@ -73,7 +73,7 @@ WHERE id = #{id} AND delete_type = 0 - INSERT INTO jcl_org_post diff --git a/src/com/engine/organization/service/CompService.java b/src/com/engine/organization/service/CompService.java index f140ebc4..e01ec585 100644 --- a/src/com/engine/organization/service/CompService.java +++ b/src/com/engine/organization/service/CompService.java @@ -1,6 +1,6 @@ package com.engine.organization.service; -import com.engine.organization.entity.comp.param.CompSearchParam; +import com.engine.organization.entity.company.param.CompSearchParam; import java.util.Collection; import java.util.Map; diff --git a/src/com/engine/organization/service/PostInfoService.java b/src/com/engine/organization/service/PostInfoService.java index edeb6560..9aa6a1c5 100644 --- a/src/com/engine/organization/service/PostInfoService.java +++ b/src/com/engine/organization/service/PostInfoService.java @@ -1,6 +1,6 @@ package com.engine.organization.service; -import com.engine.organization.entity.post.param.PostInfoSearchParam; +import com.engine.organization.entity.postion.param.PostInfoSearchParam; import java.util.Collection; import java.util.Map; diff --git a/src/com/engine/organization/service/PostService.java b/src/com/engine/organization/service/PostService.java index 3aa4194d..2c06122e 100644 --- a/src/com/engine/organization/service/PostService.java +++ b/src/com/engine/organization/service/PostService.java @@ -1,7 +1,7 @@ package com.engine.organization.service; import com.engine.organization.entity.TreeData; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.po.PostPO; import java.util.Collection; import java.util.Map; diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index c2ed9090..4a0df575 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -11,10 +11,10 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.comp.bo.CompBO; -import com.engine.organization.entity.comp.dto.CompListDTO; -import com.engine.organization.entity.comp.param.CompSearchParam; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.bo.CompBO; +import com.engine.organization.entity.company.dto.CompListDTO; +import com.engine.organization.entity.company.param.CompSearchParam; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.service.CompService; diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 6970730a..837eda83 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -12,8 +12,8 @@ import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.QueryParam; -import com.engine.organization.entity.comp.bo.CompBO; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.bo.CompBO; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.po.DepartmentPO; diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 4e5e4eed..2eb1e1f0 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -7,10 +7,10 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.QueryParam; -import com.engine.organization.entity.post.dto.PostInfoDTO; -import com.engine.organization.entity.post.param.PostInfoSearchParam; -import com.engine.organization.entity.post.po.PostInfoPO; -import com.engine.organization.entity.post.vo.PostInfoTableVO; +import com.engine.organization.entity.postion.dto.PostInfoDTO; +import com.engine.organization.entity.postion.param.PostInfoSearchParam; +import com.engine.organization.entity.postion.po.PostInfoPO; +import com.engine.organization.entity.postion.vo.PostInfoTableVO; import com.engine.organization.mapper.post.PostInfoMapper; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.service.PostInfoService; diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index ed1fe268..2f2561e5 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -4,8 +4,8 @@ import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; import com.engine.organization.entity.TreeData; -import com.engine.organization.entity.post.dto.PostDTO; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.dto.PostDTO; +import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.service.PostService; import com.engine.organization.util.OrganizationAssert; diff --git a/src/com/engine/organization/web/CompController.java b/src/com/engine/organization/web/CompController.java index 7e92cd59..2a3885ab 100644 --- a/src/com/engine/organization/web/CompController.java +++ b/src/com/engine/organization/web/CompController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.QueryParam; -import com.engine.organization.entity.comp.param.CompSearchParam; +import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.CompWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; diff --git a/src/com/engine/organization/web/PostController.java b/src/com/engine/organization/web/PostController.java index 7e13fc8c..7bdf40c4 100644 --- a/src/com/engine/organization/web/PostController.java +++ b/src/com/engine/organization/web/PostController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.QueryParam; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.PostWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; diff --git a/src/com/engine/organization/web/PostInfoController.java b/src/com/engine/organization/web/PostInfoController.java index 8fefbcb6..93e4a1b9 100644 --- a/src/com/engine/organization/web/PostInfoController.java +++ b/src/com/engine/organization/web/PostInfoController.java @@ -3,7 +3,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; import com.engine.organization.entity.QueryParam; -import com.engine.organization.entity.post.param.PostInfoSearchParam; +import com.engine.organization.entity.postion.param.PostInfoSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.PostInfoWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; diff --git a/src/com/engine/organization/webservice/CustomBrowserService.java b/src/com/engine/organization/webservice/CustomBrowserService.java index d6086e7f..2c155efb 100644 --- a/src/com/engine/organization/webservice/CustomBrowserService.java +++ b/src/com/engine/organization/webservice/CustomBrowserService.java @@ -1,6 +1,6 @@ package com.engine.organization.webservice; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.po.CompPO; import javax.jws.WebMethod; import javax.jws.WebService; diff --git a/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java b/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java index 94c0d1e1..1591caeb 100644 --- a/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java +++ b/src/com/engine/organization/webservice/CustomBrowserServiceImpl.java @@ -1,6 +1,6 @@ package com.engine.organization.webservice; -import com.engine.organization.entity.comp.po.CompPO; +import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections4.CollectionUtils; diff --git a/src/com/engine/organization/wrapper/CompWrapper.java b/src/com/engine/organization/wrapper/CompWrapper.java index d0ea64b6..6e63ba43 100644 --- a/src/com/engine/organization/wrapper/CompWrapper.java +++ b/src/com/engine/organization/wrapper/CompWrapper.java @@ -2,7 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.comp.param.CompSearchParam; +import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.service.CompService; import com.engine.organization.service.impl.CompServiceImpl; import weaver.hrm.User; diff --git a/src/com/engine/organization/wrapper/PostInfoWrapper.java b/src/com/engine/organization/wrapper/PostInfoWrapper.java index 8a7f4e25..8db4a99a 100644 --- a/src/com/engine/organization/wrapper/PostInfoWrapper.java +++ b/src/com/engine/organization/wrapper/PostInfoWrapper.java @@ -2,7 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.organization.entity.post.param.PostInfoSearchParam; +import com.engine.organization.entity.postion.param.PostInfoSearchParam; import com.engine.organization.service.PostInfoService; import com.engine.organization.service.impl.PostInfoServiceImpl; import org.apache.ibatis.annotations.Param; diff --git a/src/com/engine/organization/wrapper/PostWrapper.java b/src/com/engine/organization/wrapper/PostWrapper.java index b978fb1f..e47e6112 100644 --- a/src/com/engine/organization/wrapper/PostWrapper.java +++ b/src/com/engine/organization/wrapper/PostWrapper.java @@ -3,7 +3,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.entity.TreeData; -import com.engine.organization.entity.post.po.PostPO; +import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.service.PostService; import com.engine.organization.service.impl.PostServiceImpl; import org.apache.ibatis.annotations.Param;