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 2023-07-25 16:46:08 +08:00
parent 820b13b932
commit 87372be17f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -278,6 +278,15 @@ public class JobServiceImpl extends Service implements JobService {
for (ExtendTitlePO extendTitle : extendTitles) {
List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), params, "scheme_id", "parent_comp");
if (CollectionUtils.isNotEmpty(items)) {
for (SearchConditionItem searchConditionItem : items) {
if("ec_jobTitle".equals(searchConditionItem.getDomkey()[0])){
BrowserBean browserBean = searchConditionItem.getBrowserConditionParam();
String s = JSONObject.toJSONString(browserBean);
browserBean.setHasAddBtn(true);
searchConditionItem.setBrowserConditionParam(browserBean);
}
}
addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
}
}

2
src/com/engine/organization/util/saveimport/OrgImportUtil.java
View File

@ -81,6 +81,8 @@ public class OrgImportUtil {
object = Integer.parseInt(cellValue);
} else if ("float".equals(valueType)) {
object = Float.parseFloat(cellValue);
}else if("text".equals(valueType)) {
object = cellValue;
} else {
try {
object = new BigDecimal(cellValue).toPlainString();