|
|
@ -34,8 +34,8 @@ public class PostServiceImpl extends Service implements PostService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int savePost(PostPO postPO) {
|
|
|
|
public int savePost(PostPO postPO) {
|
|
|
|
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
|
|
|
HasRightUtil.hasRight(user, RIGHT_NAME, false);
|
|
|
|
List<PostPO> list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo()));
|
|
|
|
// List<PostPO> list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo()));
|
|
|
|
OrganizationAssert.isEmpty(list, "编号不允许重复");
|
|
|
|
// OrganizationAssert.isEmpty(list, "编号不允许重复");
|
|
|
|
return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID()));
|
|
|
|
return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -60,8 +60,6 @@ public class PostServiceImpl extends Service implements PostService {
|
|
|
|
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
|
|
|
List<SearchConditionGroup> addGroups = new ArrayList<>();
|
|
|
|
SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName");
|
|
|
|
SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName");
|
|
|
|
postNameItem.setRules("required|string");
|
|
|
|
postNameItem.setRules("required|string");
|
|
|
|
SearchConditionItem postNoItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "postNo");
|
|
|
|
|
|
|
|
postNoItem.setRules("required|string");
|
|
|
|
|
|
|
|
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
|
|
|
|
SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
|
|
|
|
|
|
|
|
|
|
|
|
// 编辑状态下赋值操作
|
|
|
|
// 编辑状态下赋值操作
|
|
|
@ -71,12 +69,10 @@ public class PostServiceImpl extends Service implements PostService {
|
|
|
|
OrganizationAssert.notNull(postPO, "选择的数据不存在,或数据已删除");
|
|
|
|
OrganizationAssert.notNull(postPO, "选择的数据不存在,或数据已删除");
|
|
|
|
|
|
|
|
|
|
|
|
postNameItem.setValue(postPO.getPostName());
|
|
|
|
postNameItem.setValue(postPO.getPostName());
|
|
|
|
postNoItem.setValue(postPO.getPostNo());
|
|
|
|
|
|
|
|
descriptionItem.setValue(postPO.getDescription());
|
|
|
|
descriptionItem.setValue(postPO.getDescription());
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
selectItems.add(postNoItem);
|
|
|
|
|
|
|
|
selectItems.add(postNameItem);
|
|
|
|
selectItems.add(postNameItem);
|
|
|
|
selectItems.add(descriptionItem);
|
|
|
|
selectItems.add(descriptionItem);
|
|
|
|
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
|
|
|
|
addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
|
|
|
@ -87,7 +83,7 @@ public class PostServiceImpl extends Service implements PostService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public TreeData getTreeData() {
|
|
|
|
public TreeData getTreeData() {
|
|
|
|
ArrayList<TreeData> treeDataList = getPostMapper().getTreeData();
|
|
|
|
ArrayList<TreeData> treeDataList = getPostMapper().getTreeData();
|
|
|
|
return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build();
|
|
|
|
return TreeData.builder().children(treeDataList).title("职务分类").key("-1").build();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|