From 7d1fc84fad2f4627eb855d44a86e3b7d0f90fe91 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 18 Nov 2022 16:28:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E6=A0=91=E6=8E=92=E5=BA=8F=E3=80=81=E4=BA=BA=E5=91=98=E5=8D=A1?= =?UTF-8?q?=E7=89=87BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/personnelcard/UserCard.java | 17 +++++++++--- .../personnelcard/PersonnelCardMapper.xml | 4 +-- .../thread/OrganizationSyncEc.java | 5 ++++ .../util/saveimport/OrgImportUtil.java | 26 ++++++++++++++++++- .../util/tree/SearchTreeUtil.java | 23 +++++++++------- 5 files changed, 59 insertions(+), 16 deletions(-) diff --git a/src/com/engine/organization/entity/personnelcard/UserCard.java b/src/com/engine/organization/entity/personnelcard/UserCard.java index c286cd50..f870ee66 100644 --- a/src/com/engine/organization/entity/personnelcard/UserCard.java +++ b/src/com/engine/organization/entity/personnelcard/UserCard.java @@ -27,10 +27,21 @@ public class UserCard { private String email; private String phone; private String belongTo; + private String accountType; private String status; - public String getBelongTo() { - return StringUtils.isBlank(belongTo) ? "主账号" : "次账号"; + public String getAccountType() { + if (StringUtils.isBlank(accountType)) { + return ""; + } + switch (accountType) { + case "0": + return "主账号"; + case "1": + return "次账号"; + default: + return ""; + } } public String getStatus() { @@ -43,7 +54,7 @@ public class UserCard { public String getImage() { weaver.hrm.User user = new weaver.hrm.User(); user.setLanguage(LanguageService.getDefaultLang()); - if(StringUtils.isNotBlank(image)&& image.contains("/")){ + if (StringUtils.isNotBlank(image) && image.contains("/")) { return image; } return FieldDefinedValueUtil.getFieldValue(user, ExtendInfoPO.builder().controlType(6).browserType("1").build(), image); diff --git a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml index a9184400..1b19be40 100644 --- a/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/PersonnelCardMapper.xml @@ -8,7 +8,7 @@ - + @@ -33,7 +33,7 @@ sex, email, mobile, - belong_to, + account_type, status from jcl_org_hrmresource where id = #{id} diff --git a/src/com/engine/organization/thread/OrganizationSyncEc.java b/src/com/engine/organization/thread/OrganizationSyncEc.java index 16d97e93..36636eeb 100644 --- a/src/com/engine/organization/thread/OrganizationSyncEc.java +++ b/src/com/engine/organization/thread/OrganizationSyncEc.java @@ -225,6 +225,11 @@ public class OrganizationSyncEc { String oldName = oldJobPO.getJobName(); String newName = Util.null2String(params.get("job_name")); + if(newName.equals(oldName)){ + this.resultMap = new HashMap<>(); + this.resultMap.put("sign", "1"); + return; + } RecordInfo oldHrmJobTitle = getSystemDataMapper().getHrmJobTitleByName(oldName); Map map = new HashMap<>(); diff --git a/src/com/engine/organization/util/saveimport/OrgImportUtil.java b/src/com/engine/organization/util/saveimport/OrgImportUtil.java index cfda1908..07879d32 100644 --- a/src/com/engine/organization/util/saveimport/OrgImportUtil.java +++ b/src/com/engine/organization/util/saveimport/OrgImportUtil.java @@ -30,17 +30,35 @@ import java.util.stream.Collectors; */ public class OrgImportUtil { + /** + * 插入导入日志信息 + * + * @param importType + * @param operateType + * @param user + * @return + */ public static Long saveImportLog(String importType, String operateType, User user) { JclImportHistoryPO historyPO = JclImportHistoryPO.builder().operator((long) user.getUID()).operateTime(DateUtil.getFullDate()).clientAddress(user.getLoginip()).importType(importType).sourceFrom("excel").operateType(operateType).status("importing").build(); MapperProxyFactory.getProxy(JclImportHistoryMapper.class).insertHistory(historyPO); return historyPO.getId(); } + /** + * 插入导入日志详细信息 + * + * @param historyDetailPO + */ public static void saveImportDetailLog(JclImportHistoryDetailPO historyDetailPO) { - String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据," + historyDetailPO.getRelatedName() + historyDetailPO.getOperateDetail(); + String relatedName = ""; + if (StringUtils.isNotBlank(historyDetailPO.getRelatedName())) { + relatedName = "[" + historyDetailPO.getRelatedName() + "]"; + } + String detailMsg = "导入第" + historyDetailPO.getRowNums() + "行数据," + relatedName + historyDetailPO.getOperateDetail(); historyDetailPO.setOperateDetail(detailMsg); MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(historyDetailPO); } + /** * 转换存入数据库的值 */ @@ -97,6 +115,12 @@ public class OrgImportUtil { return object; } + /** + * 读取表格中的内容 + * + * @param cell + * @return + */ public static String getCellValue(XSSFCell cell) { String cellValue = ""; if (cell == null) diff --git a/src/com/engine/organization/util/tree/SearchTreeUtil.java b/src/com/engine/organization/util/tree/SearchTreeUtil.java index 7d235349..71eb06c5 100644 --- a/src/com/engine/organization/util/tree/SearchTreeUtil.java +++ b/src/com/engine/organization/util/tree/SearchTreeUtil.java @@ -35,7 +35,7 @@ public class SearchTreeUtil { // 排序，设置是否为叶子节点 List collect = treeList.stream().peek(item -> item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs())) - ).sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + ).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(collect)) { treeDatas.addAll(collect); } @@ -87,14 +87,16 @@ public class SearchTreeUtil { * @return */ public static List builderTreeMode(List treeList) { - List sortedList = treeList.stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); - Map> collects = sortedList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); + Map> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid)); Set leafIds = new HashSet<>(); - List collect = sortedList.stream().peek(e -> { - e.setSubs(collects.get(e.getId())); - leafIds.add(e.getId()); - if (CollectionUtils.isNotEmpty(e.getSubs())) { - e.setIsParent(true); + List collect = treeList.stream().peek(e -> { + if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) { + List nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList()); + e.setSubs(nodes); + leafIds.add(e.getId()); + if (CollectionUtils.isNotEmpty(e.getSubs())) { + e.setIsParent(true); + } } }).collect(Collectors.toList()); return collect.stream().filter(item -> !leafIds.contains(item.getPid())).collect(Collectors.toList()); @@ -113,13 +115,14 @@ public class SearchTreeUtil { boolean isAdd = !childMap.isEmpty(); Set leafIds = new HashSet<>(); List collect = treeList.stream().peek(e -> { - Set treeNodes = new HashSet<>(); + Set treeNodes = new LinkedHashSet<>(); List nodes = parentMap.get(e.getId()); if (CollectionUtils.isNotEmpty(nodes)) { treeNodes.addAll(nodes); } if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) { - treeNodes.addAll(childMap.get(e.getId())); + List searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList()); + treeNodes.addAll(searchTrees); } if (CollectionUtils.isNotEmpty(e.getSubs())) { treeNodes.addAll(e.getSubs()); From ae2e5bb5a44aec4cadf59fde25ee3de01bca674f Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 21 Nov 2022 10:58:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E5=91=98Mapper=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/hrmresource/HrmResourceMapper.java | 51 ---------------- .../mapper/hrmresource/HrmResourceMapper.xml | 61 ------------------- .../mapper/resource/ResourceMapper.java | 18 +++++- .../mapper/resource/ResourceMapper.xml | 26 ++++++++ .../service/impl/ExtServiceImpl.java | 6 +- .../impl/HrmPersonnelCardServiceImpl.java | 10 +-- .../service/impl/HrmResourceServiceImpl.java | 7 +-- .../service/impl/ImportCommonServiceImpl.java | 6 +- .../impl/ManagerDetachServiceImpl.java | 10 +-- .../thread/HrmResourceTriggerRunnable.java | 8 +-- .../util/relation/ResourceSyncUtil.java | 4 +- 11 files changed, 66 insertions(+), 141 deletions(-) delete mode 100644 src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java delete mode 100644 src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java deleted file mode 100644 index 8ee8675d..00000000 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.engine.organization.mapper.hrmresource; - -import org.apache.ibatis.annotations.Param; - -/** - * @description: - * @author:dxfeng - * @createTime: 2022/05/20 - * @version: 1.0 - */ -public interface HrmResourceMapper { - - /** - * 获取最大ID - * - * @return - */ - Long getMaxId(); - - Long getMaxShowOrder(); - - - /** - * 根据ID查询姓名 - * - * @param id - * @return - */ - String getLastNameById(@Param("id") Long id); - - /** - * 根据所选关键字段查询ID - * - * @param keyField - * @param keyFieldValue - * @return - */ - Long getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); - - ///** - // * 根据所选关键字段，查询关键列 - // * - // * @param keyField - // * @return - // */ - //List getKeyMapByKetField(@Param("keyField") String keyField); - - String getEcResourceId(@Param("jclResourceId") String jclResourceId); - - Long getJclResourceId(@Param("ecResourceId") String ecResourceId); -} diff --git a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml deleted file mode 100644 index 6e8b2355..00000000 --- a/src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - t - . - id - , t.creator - , t.delete_type - , t.create_time - , t.update_time - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.java b/src/com/engine/organization/mapper/resource/ResourceMapper.java index 1dfe0889..7b331550 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.java @@ -15,7 +15,7 @@ import java.util.List; **/ public interface ResourceMapper { - List listAll(@Param("ids")List ids); + List listAll(@Param("ids") List ids); List listDetachAll(@Param("ids") List ids, @Param("companyIds") List companyIds); @@ -26,4 +26,20 @@ public interface ResourceMapper { HrmResourcePO getResourceById(@Param("id") String id); List listByNo(@Param("workCode") String workCode); + + Long getMaxShowOrder(); + + /** + * 根据所选关键字段查询ID + * + * @param keyField + * @param keyFieldValue + * @return + */ + Long getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); + + String getEcResourceId(@Param("jclResourceId") String jclResourceId); + + Long getJclResourceId(@Param("ecResourceId") String ecResourceId); + } diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.xml b/src/com/engine/organization/mapper/resource/ResourceMapper.xml index a212a80e..fecb80df 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.xml @@ -128,6 +128,32 @@ order by t.show_order asc; + + + + + + + + AND t.last_name like CONCAT('%',#{param.lastName},'%') diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java index 0d50d97f..908b92e4 100644 --- a/src/com/engine/organization/service/impl/ExtServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java @@ -16,8 +16,8 @@ import com.engine.organization.entity.personnelcard.po.CardButtonPO; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.mapper.codesetting.CodeRuleMapper; import com.engine.organization.mapper.extend.*; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.personnelcard.CardButtonMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.service.ExtService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.DBType; @@ -74,7 +74,7 @@ public class ExtServiceImpl extends Service implements ExtService { } List readOnlyFieldList = new ArrayList<>(Arrays.asList(readOnlyFields)); if ("4".equals(extendType) && noEditRight(user)) { - String ecResourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getEcResourceId(String.valueOf(id)); + String ecResourceId = MapperProxyFactory.getProxy(ResourceMapper.class).getEcResourceId(String.valueOf(id)); if (Util.null2String(user.getUID()).equals(ecResourceId)) { List readOnlyList = infoPOList.stream().filter(item -> !"1".equals(Util.null2String(item.getIsModify()))).map(ExtendInfoPO::getFieldName).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(readOnlyList)) { @@ -162,7 +162,7 @@ public class ExtServiceImpl extends Service implements ExtService { boolean checkRight = true; if (2 == viewAttr && "4".equals(extendType) && noEditRight(user)) { checkRight = false; - String ecResourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getEcResourceId(String.valueOf(id)); + String ecResourceId = MapperProxyFactory.getProxy(ResourceMapper.class).getEcResourceId(String.valueOf(id)); if (Util.null2String(user.getUID()).equals(ecResourceId)) { infoPOList.removeIf(item -> !"1".equals(Util.null2String(item.getIsModify()))); } else { diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index fbdc1007..9ed1f2e9 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -18,10 +18,10 @@ import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendGroupMapper; import com.engine.organization.mapper.extend.ExtendInfoMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.personnelcard.CardAccessMapper; import com.engine.organization.mapper.personnelcard.CardButtonMapper; import com.engine.organization.mapper.personnelcard.PersonnelCardMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.service.HrmPersonnelCardService; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.DBType; @@ -71,8 +71,8 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel return MapperProxyFactory.getProxy(ExtMapper.class); } - private HrmResourceMapper getHrmResourceMapper() { - return MapperProxyFactory.getProxy(HrmResourceMapper.class); + private ResourceMapper getResourceMapper() { + return MapperProxyFactory.getProxy(ResourceMapper.class); } private CardButtonMapper getCardButtonMapper() { @@ -85,9 +85,9 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel Map resultMap = new HashMap<>(); UserCard userInfo; if (null == uId) { - uId = getHrmResourceMapper().getJclResourceId(Util.null2String(user.getUID())); + uId = getResourceMapper().getJclResourceId(Util.null2String(user.getUID())); } - String ecResourceId = getHrmResourceMapper().getEcResourceId(uId.toString()); + String ecResourceId = getResourceMapper().getEcResourceId(uId.toString()); userInfo = getPersonnelCardMapper().getUserById(uId); userInfo.setEcId(ecResourceId); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 0ab4686c..5f6fd416 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -36,7 +36,6 @@ import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.extend.ExtendTitleMapper; import com.engine.organization.mapper.hrmresource.HrmRelationMapper; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.post.PostInfoMapper; @@ -158,10 +157,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return MapperProxyFactory.getProxy(JobMapper.class); } - private HrmResourceMapper getHrmResourceMapper() { - return MapperProxyFactory.getProxy(HrmResourceMapper.class); - } - private static ResourceMapper getResourceMapper() { return MapperProxyFactory.getProxy(ResourceMapper.class); } @@ -733,7 +728,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic String showOrder = Util.null2String(params.get("show_order")); // 初始化排序字段 if (StringUtils.isBlank(showOrder)) { - Long orderNum = getHrmResourceMapper().getMaxShowOrder(); + Long orderNum = getResourceMapper().getMaxShowOrder(); params.put("show_order", null == orderNum ? 1 : orderNum + 1); } diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 98d15b15..a5987bac 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -32,11 +32,11 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.employee.EmployeeMapper; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtendInfoMapper; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.jclimport.JclImportHistoryDetailMapper; import com.engine.organization.mapper.jclimport.JclImportHistoryMapper; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.mapper.scheme.GradeMapper; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.mapper.scheme.SchemeMapper; @@ -1547,7 +1547,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO.setRelatedName(keyFieldValue); // 判断当前人员是否存在 - Long resourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getIdByKeyField(keyField, keyFieldValue); + Long resourceId = MapperProxyFactory.getProxy(ResourceMapper.class).getIdByKeyField(keyField, keyFieldValue); if ("add".equals(operateType)) { if (resourceId != null) { historyDetailPO.setOperateDetail(keyFieldValue + "已存在"); @@ -1580,7 +1580,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ String showOrder = Util.null2String(map.get("show_order")); if (StringUtils.isBlank(showOrder)) { - Long maxShowOrder = MapperProxyFactory.getProxy(HrmResourceMapper.class).getMaxShowOrder(); + Long maxShowOrder = MapperProxyFactory.getProxy(ResourceMapper.class).getMaxShowOrder(); if (null == maxShowOrder) { maxShowOrder = 0L; } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 36b3b456..fd3c2307 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -13,8 +13,8 @@ import com.engine.organization.entity.detach.po.ManagerDetachPO; import com.engine.organization.entity.detach.vo.ManagerDetachVO; import com.engine.organization.mapper.detach.ManagerDetachMapper; import com.engine.organization.mapper.employee.EmployeeMapper; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.service.ManagerDetachService; import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.OrganizationFormItemUtil; @@ -46,8 +46,8 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return MapperProxyFactory.getProxy(ManagerDetachMapper.class); } - public HrmResourceMapper getHrmResourceMapper() { - return MapperProxyFactory.getProxy(HrmResourceMapper.class); + public ResourceMapper getResourceMapper() { + return MapperProxyFactory.getProxy(ResourceMapper.class); } public EmployeeMapper getEmployeeMapper() { @@ -123,7 +123,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe ManagerDetachPO managerDetachPO = ManagerDetachPO.builder() .managerType(0) .ecManager(param.getEcManager()) - .jclManager(getHrmResourceMapper().getJclResourceId(String.valueOf(param.getEcManager())).intValue()) + .jclManager(getResourceMapper().getJclResourceId(String.valueOf(param.getEcManager())).intValue()) .ecRolelevel(param.getEcRolelevel()) .jclRolelevel(EcHrmRelationUtil.getBatchJclCompanyId(param.getEcRolelevel()) != null ? String.valueOf(EcHrmRelationUtil.getBatchJclCompanyId(param.getEcRolelevel())) : null) .manageModule("组织管理") @@ -141,7 +141,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe ManagerDetachPO managerDetachPO = ManagerDetachPO.builder() .id(param.getId()) .ecManager(param.getEcManager()) - .jclManager(getHrmResourceMapper().getJclResourceId(String.valueOf(param.getEcManager())).intValue()) + .jclManager(getResourceMapper().getJclResourceId(String.valueOf(param.getEcManager())).intValue()) .ecRolelevel(param.getEcRolelevel()) .jclRolelevel(EcHrmRelationUtil.getBatchJclCompanyId(param.getEcRolelevel()) != null ? String.valueOf(EcHrmRelationUtil.getBatchJclCompanyId(param.getEcRolelevel())) : null) .build(); diff --git a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java index 0a19fe93..b4e01fbd 100644 --- a/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java +++ b/src/com/engine/organization/thread/HrmResourceTriggerRunnable.java @@ -4,9 +4,9 @@ import com.engine.organization.entity.hrmresource.po.HrmResourcePO; import com.engine.organization.entity.job.po.JobPO; import com.engine.organization.entity.map.JclOrgMap; import com.engine.organization.entity.personnelcard.UserCard; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; import com.engine.organization.mapper.jclorgmap.JclOrgMapper; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.mapper.trigger.CompTriggerMapper; import com.engine.organization.mapper.trigger.HrmResourceTriggerMapper; import com.engine.organization.util.OrganizationDateUtil; @@ -32,8 +32,8 @@ public class HrmResourceTriggerRunnable implements Runnable { private HrmResourceTriggerMapper getHrmResourceTriggerMapper() { return MapperProxyFactory.getProxy(HrmResourceTriggerMapper.class); } - private HrmResourceMapper getHrmResourceMapper() { - return MapperProxyFactory.getProxy(HrmResourceMapper.class); + private ResourceMapper getResourceMapper() { + return MapperProxyFactory.getProxy(ResourceMapper.class); } private JclOrgMapper getJclOrgMapper() { return MapperProxyFactory.getProxy(JclOrgMapper.class); @@ -52,7 +52,7 @@ public class HrmResourceTriggerRunnable implements Runnable { JclOrgMap jclMap = new JclOrgMap(); jclMap.setFType(4); // 查询当前人员信息数据 - String ecResourceId = getHrmResourceMapper().getEcResourceId(userId.toString()); + String ecResourceId = getResourceMapper().getEcResourceId(userId.toString()); // EC人员 HrmResource ecHrmResource = getHrmResourceTriggerMapper().getHrmResource(Long.parseLong(ecResourceId)); // 聚才林人员 diff --git a/src/com/engine/organization/util/relation/ResourceSyncUtil.java b/src/com/engine/organization/util/relation/ResourceSyncUtil.java index 274032ff..3b397301 100644 --- a/src/com/engine/organization/util/relation/ResourceSyncUtil.java +++ b/src/com/engine/organization/util/relation/ResourceSyncUtil.java @@ -17,7 +17,7 @@ import com.engine.hrm.util.HrmWeakPasswordUtil; import com.engine.hrm.util.face.HrmFaceCheckManager; import com.engine.hrm.util.face.ValidateFieldManager; import com.engine.hrm.util.face.bean.CheckItemBean; -import com.engine.organization.mapper.hrmresource.HrmResourceMapper; +import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.util.db.MapperProxyFactory; import com.weaver.general.BaseBean; import ln.LN; @@ -986,7 +986,7 @@ public class ResourceSyncUtil { String jclResourceId = Util.null2String(params.get("id")); String ecResourceId = ""; if(StringUtils.isNotBlank(jclResourceId)){ - ecResourceId = MapperProxyFactory.getProxy(HrmResourceMapper.class).getEcResourceId(jclResourceId); + ecResourceId = MapperProxyFactory.getProxy(ResourceMapper.class).getEcResourceId(jclResourceId); } // 更新人员时，初始化人员参数 if(StringUtils.isNotBlank(ecResourceId)){