From 725d64888c633538d6149d9fda65cc0ba1216afc Mon Sep 17 00:00:00 2001 From: Mlin Date: Thu, 13 Jul 2023 11:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=AE=B0=E5=BD=95int=E7=B1=BB=E5=9E=8Bbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChartServiceImpl.java | 97 ++++++++++--------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index afb053a3..e980b1c8 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -17,6 +17,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; import weaver.conn.RecordSetTrans; +import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; import weaver.hrm.resource.ResourceComInfo; @@ -509,19 +510,19 @@ public class ChartServiceImpl extends Service implements ChartService { while (rs.next()) { insertList = new ArrayList<>(); insertList.add(currentUser); - insertList.add(rs.getInt("subcompanyid")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); insertList.add(rs.getString("subcompanyname")); insertList.add(rs.getString("subcompanydesc")); insertList.add(rs.getString("company")); - insertList.add(rs.getInt("supsubcompanyid")); + insertList.add(StringUtils.isBlank(rs.getString("supsubcompanyid")) ? null : rs.getInt("supsubcompanyid")); insertList.add(rs.getString("supsubcompany")); - insertList.add(rs.getInt("canceled")); + insertList.add(StringUtils.isBlank(rs.getString("canceled")) ? null : rs.getInt("canceled")); insertList.add(rs.getString("subcompanycode")); - insertList.add(rs.getInt("limitusers")); - insertList.add(rs.getInt("tlevel")); + insertList.add(StringUtils.isBlank(rs.getString("limitusers")) ? null : rs.getInt("limitusers")); + insertList.add(StringUtils.isBlank(rs.getString("tlevel")) ? null : rs.getInt("tlevel")); insertList.add(currentDate); insertList.add(virtualFlag ? Util.getIntValue(rs.getString("isvirtual"),0) : 1); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } @@ -536,12 +537,12 @@ public class ChartServiceImpl extends Service implements ChartService { while (rs.next()){ insertList = new ArrayList<>(); insertList.add(currentUser); - insertList.add(rs.getInt("departmentid")); + insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid")); insertList.add(rs.getString("departmentmark")); insertList.add(rs.getString("departmentname")); - insertList.add(rs.getInt("subcompanyid")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); insertList.add(rs.getString("subcompany")); - insertList.add(rs.getInt("supdepartmentid")); + insertList.add(StringUtils.isBlank(rs.getString("supdepartmentid")) ? null : rs.getInt("supdepartmentid")); insertList.add(rs.getString("supdepartment")); insertList.add(rs.getInt("canceled")); insertList.add(rs.getString("departmentcode")); @@ -550,7 +551,7 @@ public class ChartServiceImpl extends Service implements ChartService { insertList.add(rs.getString("fleader")); insertList.add(currentDate); insertList.add(virtualFlag ? Util.getIntValue(rs.getString("isvirtual"),0) : 1); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertDeptSql = "insert into jcl_chart_department(creater, departmentid, departmentmark, departmentname, subcompanyid,\n" + @@ -566,7 +567,7 @@ public class ChartServiceImpl extends Service implements ChartService { "left join hrmdepartment c on a.ec_department=c.id " + "left join hrmsubcompany d on a.ec_company=d.id"); insertParamList = new ArrayList<>(); - while (rs.next()){ + while (rs.next()) { insertList = new ArrayList<>(); insertList.add(rs.getString("jobid")); insertList.add(currentUser); @@ -580,7 +581,7 @@ public class ChartServiceImpl extends Service implements ChartService { insertList.add(rs.getString("jobcode")); insertList.add(rs.getString("description")); insertList.add(currentDate); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertJobSql = "insert into jcl_chart_job(jobid,creater,jobname,departmentid,department,subcompanyid," + @@ -602,15 +603,15 @@ public class ChartServiceImpl extends Service implements ChartService { insertParamList = new ArrayList<>(); while (rs.next()) { insertList = new ArrayList<>(); - insertList.add(rs.getInt("resourceid")); + insertList.add(StringUtils.isBlank(rs.getString("resourceid")) ? null : rs.getInt("resourceid")); insertList.add(currentUser); - insertList.add(rs.getInt("workyear")); + insertList.add(StringUtils.isBlank(rs.getString("workyear")) ? null : rs.getInt("workyear")); insertList.add(rs.getString("usekind")); insertList.add(rs.getString("managerstr")); - insertList.add(rs.getInt("status")); + insertList.add(StringUtils.isBlank(rs.getString("status")) ? null : rs.getInt("status")); insertList.add(rs.getString("sex")); - insertList.add(rs.getInt("accounttype")); - insertList.add(rs.getInt("belongto")); + insertList.add(StringUtils.isBlank(rs.getString("accounttype")) ? null : rs.getInt("accounttype")); + insertList.add(StringUtils.isBlank(rs.getString("belongto")) ? null : rs.getInt("belongto")); insertList.add(rs.getString("loginid")); insertList.add(rs.getString("maritalstatus")); insertList.add(rs.getString("telephone")); @@ -621,25 +622,25 @@ public class ChartServiceImpl extends Service implements ChartService { insertList.add(rs.getString("resourcetype")); insertList.add(rs.getString("startdate")); insertList.add(rs.getString("enddate")); - insertList.add(rs.getInt("jobtitleid")); + insertList.add(StringUtils.isBlank(rs.getString("jobtitleid")) ? null : rs.getInt("jobtitleid")); insertList.add(rs.getString("jobtitle")); - insertList.add(rs.getInt("joblevel")); - insertList.add(rs.getInt("seclevel")); - insertList.add(rs.getInt("departmentid")); + insertList.add(StringUtils.isBlank(rs.getString("joblevel")) ? null : rs.getInt("joblevel")); + insertList.add(StringUtils.isBlank(rs.getString("seclevel")) ? null : rs.getInt("seclevel")); + insertList.add(StringUtils.isBlank(rs.getString("departmentid")) ? null : rs.getInt("departmentid")); insertList.add(rs.getString("department")); - insertList.add(rs.getInt("subcompanyid")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); insertList.add(rs.getString("subcompany")); insertList.add(rs.getString("costcenter")); - insertList.add(rs.getInt("manager")); - insertList.add(rs.getInt("assistant")); + insertList.add(StringUtils.isBlank(rs.getString("manager")) ? null : rs.getInt("manager")); + insertList.add(StringUtils.isBlank(rs.getString("assistant")) ? null : rs.getInt("assistant")); insertList.add(rs.getString("workcode")); insertList.add(rs.getString("classification")); insertList.add(currentDate); insertList.add(rs.getString("policy")); insertList.add(rs.getString("degree")); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertList.add(rs.getString("lastname")); - insertList.add(rs.getString("companyworkyear")); + insertList.add(StringUtils.isBlank(rs.getString("companyworkyear")) ? null : rs.getString("companyworkyear")); insertParamList.add(insertList); } String insertResourceSql = "insert into jcl_chart_resource(resourceid, creater, workyear, usekind, managerstr," + @@ -665,17 +666,17 @@ public class ChartServiceImpl extends Service implements ChartService { "virtualtype,virtualtypedesc from hrmcompanyvirtual where id=?",fclass); while (rs.next()){ insertList = new ArrayList<>(); - insertList.add(rs.getInt("companyvirtualid")); + insertList.add(StringUtils.isBlank(rs.getString("companyvirtualid")) ? null : rs.getInt("companyvirtualid")); insertList.add(currentUser); insertList.add(rs.getString("companyname")); insertList.add(rs.getString("companycode")); insertList.add(rs.getString("companydesc")); - insertList.add(Util.getIntValue(rs.getString("showorder"))); - insertList.add(rs.getInt("canceled")); + insertList.add(StringUtils.isBlank(rs.getString("showorder")) ? null : rs.getInt("showorder")); + insertList.add(StringUtils.isBlank(rs.getString("canceled")) ? null : rs.getInt("canceled")); insertList.add(rs.getString("virtualtype")); insertList.add(rs.getString("virtualtypedesc")); insertList.add(currentDate); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertVirtualComSql = "insert into jcl_chart_companyvirtual(companyvirtualid,creater,companyname,companycode,companydesc,showorder,\n" + @@ -691,21 +692,21 @@ public class ChartServiceImpl extends Service implements ChartService { insertParamList = new ArrayList<>(); while (rs.next()) { insertList = new ArrayList<>(); - insertList.add(rs.getInt("subcompanyvirtualid")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyvirtualid")) ? null : rs.getInt("subcompanyvirtualid")); insertList.add(currentUser); insertList.add(rs.getString("subcompanyname")); insertList.add(rs.getString("subcompanycode")); insertList.add(rs.getString("subcompanydesc")); insertList.add(rs.getString("supsubcompany")); - insertList.add(rs.getInt("supsubcomid")); + insertList.add(StringUtils.isBlank(rs.getString("supsubcomid")) ? null : rs.getInt("supsubcomid")); insertList.add(rs.getString("company")); - insertList.add(rs.getInt("companyid")); - insertList.add(rs.getInt("canceled")); + insertList.add(StringUtils.isBlank(rs.getString("companyid")) ? null : rs.getInt("companyid")); + insertList.add(StringUtils.isBlank(rs.getString("canceled")) ? null : rs.getInt("canceled")); insertList.add(rs.getString("virtualtype")); insertList.add(rs.getString("tlevel")); - insertList.add(Util.getIntValue(rs.getString("showorder"))); + insertList.add(StringUtils.isBlank(rs.getString("showorder")) ? null : rs.getInt("showorder")); insertList.add(currentDate); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertVirtualSubComSql = "insert into jcl_chart_subcompanyvirtual(subcompanyvirtualid, creater, " + @@ -722,22 +723,22 @@ public class ChartServiceImpl extends Service implements ChartService { insertParamList = new ArrayList<>(); while (rs.next()){ insertList = new ArrayList<>(); - insertList.add(rs.getInt("departmentvirtualid")); + insertList.add(StringUtils.isBlank(rs.getString("departmentvirtualid")) ? null : rs.getInt("departmentvirtualid")); insertList.add(currentUser); insertList.add(rs.getString("departmentname")); insertList.add(rs.getString("departmentcode")); insertList.add(rs.getString("departmentmark")); insertList.add(rs.getString("supdeptment")); - insertList.add(rs.getInt("supdepid")); - insertList.add(rs.getString("allsupdepid")); + insertList.add(StringUtils.isBlank(rs.getString("supdepid")) ? null : rs.getInt("supdepid")); + insertList.add(StringUtils.isBlank(rs.getString("allsupdepid")) ? null : rs.getInt("allsupdepid")); insertList.add(rs.getString("subcompany")); - insertList.add(rs.getInt("subcompanyid")); - insertList.add(rs.getInt("canceled")); + insertList.add(StringUtils.isBlank(rs.getString("subcompanyid")) ? null : rs.getInt("subcompanyid")); + insertList.add(StringUtils.isBlank(rs.getString("canceled")) ? null : rs.getInt("canceled")); insertList.add(rs.getString("virtualtype")); insertList.add(rs.getString("tlevel")); - insertList.add(Util.getIntValue(rs.getString("showorder"))); + insertList.add(StringUtils.isBlank(rs.getString("showorder")) ? null : rs.getInt("showorder")); insertList.add(currentDate); - insertList.add(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertVirtualDeptSql = "insert into jcl_chart_departmentvirtual(departmentvirtualid, creater, " + @@ -751,14 +752,14 @@ public class ChartServiceImpl extends Service implements ChartService { insertParamList = new ArrayList<>(); while (rs.next()) { insertList = new ArrayList<>(); - insertList.add(rs.getInt("resourceid")); - insertList.add(rs.getInt("managerid")); - insertList.add(rs.getInt("subcompanyid")); - insertList.add(rs.getInt("departmentid")); + 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(Util.getIntValue(versionId)); + insertList.add(StringUtils.isBlank(versionId) ? null : Util.getIntValue(versionId)); insertParamList.add(insertList); } String insertVirtualHrmSql = "insert into jcl_chart_resource(resourceid,MANAGER,subcompanyid," +