liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG修复

This commit is contained in:
dxfeng 2022-12-19 16:00:47 +08:00
parent d21d3148bf
commit 2b0c1d0a69
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/organization/mapper/job/JobMapper.xml
View File

@ -471,6 +471,7 @@
where ec_company = #{resourcePO.subcompanyid1}
and ec_department = #{resourcePO.departmentid}
and ec_jobtitle = #{resourcePO.jobtitle}
and delete_type = 0
</select>
<select id="getIdByNameAndPid" resultType="java.lang.Long">

6
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -381,7 +381,11 @@ public class CompServiceImpl extends Service implements CompService {
Map<String, Object> map = new HashMap<>();
map.put("id", companyId.toString());
map.put("supsubcomid", targetCompanyId.toString());
if (null == targetCompanyId) {
map.put("supsubcomid", "0");
} else {
map.put("supsubcomid", targetCompanyId.toString());
}
new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map).sync();
return companyId;
}

6
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -214,9 +214,9 @@ public class JobServiceImpl extends Service implements JobService {
// 名称
SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobTitleName");
// 所属分部
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", "");
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subcompanyid1", "");
// 所属部门
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", "");
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", "");
// 是否关键岗
List<SearchConditionOption> isKeyOptions = new ArrayList<>();
SearchConditionOption yesOption = new SearchConditionOption("0", "否");
@ -581,7 +581,7 @@ public class JobServiceImpl extends Service implements JobService {
//2.数据过滤
//3.数据插入
resourcePOS.forEach(resourcePO -> {
if (Objects.nonNull(resourcePO)) {
if (Objects.nonNull(resourcePO) && null != resourcePO.getJobtitle()) {
int count = getJobMapper().selectByConditions(resourcePO);
if (count == 0) {
JobPO jobPO = JobPO.builder()