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

代码优化

This commit is contained in:
Mlin 2023-08-07 14:38:39 +08:00
parent e0187b7337
commit 4afe2615ec
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/engine/organization/service/impl/ChartServiceImpl.java
View File

@ -407,10 +407,6 @@ public class ChartServiceImpl extends Service implements ChartService {
@Override
public Map<String, Object> versionRecord(Map<String, Object> params, User user) {
RecordSet rs = new RecordSet();
// 维度
@ -654,7 +650,7 @@ public class ChartServiceImpl extends Service implements ChartService {
}
List<Object> insertList = new ArrayList<>();
List<Object> insertList;
List<List<Object>> insertParamList = new ArrayList<>();
//当前分部版本存储
rs.executeQuery(subCompanyQuerySql);
@ -957,22 +953,6 @@ public class ChartServiceImpl extends Service implements ChartService {
"department, subcompanyid, subcompany, costcenter,manager, assistant, workcode, classification, " +
"versiondate, policy, degree,versionid,lastname,companyworkyear) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
"?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
// while (rs.next()) {
// insertList = new ArrayList<>();
// insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid"));
// insertList.add(StringUtils.isBlank(rs.getString("managerid")) ? null : rs.getInt("managerid"));
// insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid"));
// insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid"));
// insertList.add(rs.getString("managerstr"));
// //insertList.add(rs.getString("virtualtype"));
// insertList.add(currentDate);
// insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId));
// insertParamList.add(insertList);
// }
// String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," +
// "departmentid,managerstr," +
// //"virtualtype," +
// "versiondate,versionid) values (?,?,?,?,?,?,?)";
insertData(recordSetTrans,insertVirtualHrmSql,insertParamList);
}

1
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -891,6 +891,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
}
DepartmentPO parentDept = departmentPOMap.get(departmentPO.getSupDepId());
if (null != parentDept) {
OrganizationAssert.isFalse(Objects.equals(parentDept.getId(), parentDept.getSupDepId()),parentDept.getDepartmentName()+"数据异常：部门上级不能为自己");
buildParentDepts(parentDept, builderDeparts,departmentPOMap);
}
}