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-14 10:52:20 +08:00
parent 8383c08a06
commit 4117a34928
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -106,7 +106,7 @@ public class JobBrowserService extends BrowserService {
} }
String jobName = Util.null2String(params.get("jobName")); String jobName = Util.null2String(params.get("jobName"));
if (StringUtils.isNotBlank(jobName)) { if (StringUtils.isNotBlank(jobName)) {
sqlWhere += " AND t.job_name " + dbType.like(jobName); sqlWhere += " AND h.jobtitlename " + dbType.like(jobName);
} }
String ecCompany = Util.null2String(params.get("ecCompany")); String ecCompany = Util.null2String(params.get("ecCompany"));
if (StringUtils.isNotBlank(ecCompany)) { if (StringUtils.isNotBlank(ecCompany)) {

4
src/com/engine/organization/entity/job/vo/JobBrowserVO.java
View File

@ -19,8 +19,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123", @OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123",
fields = "t.id, t.job_no, t.job_name as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id", fields = "t.id, t.job_no, h.jobtitlename as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id",
fromSql = "FROM jcl_org_job t ", fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id ",
orderby = "id", orderby = "id",
sortway = "asc", sortway = "asc",
primarykey = "id", primarykey = "id",

3
src/com/engine/organization/mapper/job/JobMapper.java
View File

@ -139,4 +139,7 @@ public interface JobMapper {
*/ */
Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob); Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob);
int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);
} }

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

@ -474,6 +474,19 @@
</foreach> </foreach>
</select> </select>
<update id="updateJobCompany">
update jcl_org_job
<set>
parent_comp = #{parentCompany},
ec_company =#{ecCompany},
</set>
where delete_type = 0
AND id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}
</foreach>
</update>
<sql id="nullparentDept"> <sql id="nullparentDept">
and ifnull(ec_department,0) = and ifnull(ec_department,0) =

14
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -820,15 +820,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
* @param parentComp * @param parentComp
*/ */
private void refreshJobComp(Integer parentDepartment, Integer parentComp) { private void refreshJobComp(Integer parentDepartment, Integer parentComp) {
//List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment); List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment);
//jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList()); jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
//if (CollectionUtils.isNotEmpty(jobPOS)) { if (CollectionUtils.isNotEmpty(jobPOS)) {
// getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp); getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp);
// for (JobPO jobPO : jobPOS) { }
// // 刷新组织架构图
// new JobTriggerRunnable(jobPO.getId()).run();
// }
//}
} }
private List<SearchConditionGroup> getDepartmentConditionGroups(Map<String, Object> params) { private List<SearchConditionGroup> getDepartmentConditionGroups(Map<String, Object> params) {