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

修改时，编号可以修改

This commit is contained in:
dxfeng 2022-06-21 18:39:26 +08:00
parent 9796bdc823
commit 779e03cb32
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
View File

@ -26,7 +26,8 @@ import lombok.NoArgsConstructor;
"t.create_time," +
"t.update_time",
fromSql = "FROM jcl_org_level t inner join jcl_org_scheme s on t.scheme_id = s.id ",
orderby = "id desc",
orderby = "level_no",
sortway = "asc",
primarykey = "id",
operates = {
@OrganizationTableOperate(text = "编辑"),
@ -50,7 +51,7 @@ public class LevelTableVO {
/**
* 编号
*/
@OrganizationTableColumn(text = "编号", width = "20%", column = "level_no")
@OrganizationTableColumn(text = "编号", width = "20%", column = "level_no", orderkey = "level_no")
private String levelNo;
/**
* 名称

7
src/com/engine/organization/service/impl/GradeServiceImpl.java
View File

@ -83,6 +83,11 @@ public class GradeServiceImpl extends Service implements GradeService {
public int updateGrade(GradeSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID());
String oldGradeNo = getGradeMapper().getGradeByID(gradePO.getId()).getGradeNo();
if (!oldGradeNo.equals(gradePO.getGradeNo())) {
List<GradePO> list = getGradeMapper().listByNo(Util.null2String(param.getGradeNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
}
return getGradeMapper().updateGrade(gradePO);
}
@ -155,7 +160,7 @@ public class GradeServiceImpl extends Service implements GradeService {
levelBrowserItem.setBrowserConditionParam(levelBrowserBean);
// 编辑状态下,编号只读
gradeNoCondition.setViewAttr(1);
// gradeNoCondition.setViewAttr(1);
}
selectItems.add(gradeNoCondition);

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

@ -78,6 +78,12 @@ public class LevelServiceImpl extends Service implements LevelService {
public int updateLevel(LevelSearchParam param) {
HasRightUtil.hasRight(user, RIGHT_NAME, false);
LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID());
// 更新前先查询下旧编号，
String oldLevelNo = getLevelMapper().getLevelByID(levelPO.getId()).getLevelNo();
if (!oldLevelNo.equals(levelPO.getLevelNo())) {
List<LevelPO> list = getLevelMapper().listByNo(Util.null2String(levelPO.getLevelNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
}
return getLevelMapper().updateLevel(levelPO);
}
@ -142,7 +148,7 @@ public class LevelServiceImpl extends Service implements LevelService {
browserBean.setReplaceDatas(maps);
browserItem.setBrowserConditionParam(browserBean);
// 编辑状态下,编号只读
levelNoCondition.setViewAttr(1);
// levelNoCondition.setViewAttr(1);
}
selectItems.add(levelNoCondition);