diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index 9426e52b..af99fd66 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -48,9 +48,10 @@ from jcl_org_staffs where delete_type = 0 - + select + + from jcl_org_staff t where delete_type = 0 and comp_id = #{companyId} @@ -58,8 +59,8 @@ and dept_id = #{departmentId} - - and job_id = #{companyId} + + and job_id = #{jobId} diff --git a/src/weaver/interfaces/organization/action/StaffChangeAction.java b/src/weaver/interfaces/organization/action/StaffChangeAction.java index e21c26ca..f5d55a3e 100644 --- a/src/weaver/interfaces/organization/action/StaffChangeAction.java +++ b/src/weaver/interfaces/organization/action/StaffChangeAction.java @@ -12,6 +12,9 @@ import weaver.interfaces.workflow.action.Action; import weaver.soa.workflow.request.MainTableInfo; import weaver.soa.workflow.request.Property; import weaver.soa.workflow.request.RequestInfo; +import weaver.workflow.request.RequestManager; + +import java.util.Date; /** * @description: TODO @@ -27,7 +30,8 @@ public class StaffChangeAction implements Action { Long departmentId = null; Long jobId = null; Integer changeNum = null; - Integer businessSource = null; + RequestManager requestManager = requestInfo.getRequestManager(); + int creator = requestManager.getCreater(); MainTableInfo mainTableInfo = requestInfo.getMainTableInfo(); Property[] property = mainTableInfo.getProperty(); // 取表单数据赋值 @@ -49,9 +53,6 @@ public class StaffChangeAction implements Action { case "bzbds": changeNum = Integer.parseInt(value); break; - case "ywly": - businessSource = Integer.parseInt(value); - break; default: break; } @@ -64,7 +65,7 @@ public class StaffChangeAction implements Action { if (null != staffPO) { // 插入明细表 - StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(businessSource).requestId(requestid).build(); + StaffsPO staffsPO = StaffsPO.builder().staffId(staffPO.getId()).businessType(2).changeNum(changeNum).businessSource(2).requestId(requestid).deleteType(0).creator((long) creator).createTime(new Date()).build(); MapperProxyFactory.getProxy(StaffsMapper.class).insertIgnoreNull(staffsPO); // 更新编制表