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

!112 修改时，编号可以修改 

Merge pull request !112 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-21 10:24:13 +00:00 committed by Gitee
parent 9f8b494dd2 9796bdc823
commit 2811a0ce20
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
View File

@ -71,7 +71,7 @@ public class StaffPlanTableVO {
/**
* 状态
*/
@OrganizationTableColumn(text = "状态", width = "16%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "16%", column = "forbidden_tag")
private Integer forbiddenTag;
}

8
src/com/engine/organization/service/impl/SchemeServiceImpl.java
View File

@ -72,6 +72,12 @@ public class SchemeServiceImpl extends Service implements SchemeService {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
Map<String, Object> apidatas = new HashMap<>();
SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID());
// 更新前先查询下旧编号，
String oldSchemeNo = getSchemeMapper().getSchemeByID(schemePO.getId()).getSchemeNo();
if (!oldSchemeNo.equals(schemePO.getSchemeNo())) {
List<SchemePO> list = getSchemeMapper().listByNo(Util.null2String(schemePO.getSchemeNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
}
getSchemeMapper().updateScheme(schemePO);
return apidatas;
}
@ -129,7 +135,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
textareaItem.setValue(schemePO.getSchemeDescription());
// 编辑状态下,编号只读
schemeNoCondition.setViewAttr(1);
// schemeNoCondition.setViewAttr(1);
}
selectItems.add(schemeNoCondition);