瀏覽代碼

修改员工,同步至OA,支出多组织,多职位

river 4 年之前
父節點
當前提交
8f46a89357

+ 5 - 5
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CirculationUser.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class CirculationUser {
 
     @ApiModelProperty(value = "OA审批id", required = false)
-    private Integer workOrderId;
+    private Integer workOrder;
 
     @ApiModelProperty(value = "审批节点", required = false)
     private String state;
@@ -30,12 +30,12 @@ public class CirculationUser {
     private SysUserTsign sysUserTsign;
 
 
-    public Integer getWorkOrderId() {
-        return workOrderId;
+    public Integer getWorkOrder() {
+        return workOrder;
     }
 
-    public void setWorkOrderId(Integer workOrderId) {
-        this.workOrderId = workOrderId;
+    public void setWorkOrder(Integer workOrder) {
+        this.workOrder = workOrder;
     }
 
     public String getState() {

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -1282,7 +1282,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 			for (CirculationUser circulationUser : financialDto.getCirculationUsers()) {
 				if (workOrderId == null) {
-					workOrderId = circulationUser.getWorkOrderId();
+					workOrderId = circulationUser.getWorkOrder();
 				}
 				if (!circulationUser.getUserId().equals(user.getId())) continue;
 				circulationUser.setRealName(user.getRealName());