From f72db1b5f9341ab52763f359ed198d1b9844452c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 22 Jun 2022 11:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E4=BA=8B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E3=80=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/postion/dto/PostDTO.java | 1 - .../entity/postion/po/PostPO.java | 4 - .../entity/scheme/vo/GradeTableVO.java | 5 +- .../entity/sequence/vo/SequenceTableVO.java | 73 ++++++++++--------- .../organization/mapper/post/PostMapper.java | 9 --- .../organization/mapper/post/PostMapper.xml | 16 ---- .../mapper/scheme/LevelMapper.java | 14 +++- .../mapper/scheme/LevelMapper.xml | 12 +++ .../mapper/scheme/SchemeMapper.java | 8 ++ .../mapper/scheme/SchemeMapper.xml | 10 +++ .../organization/service/LevelService.java | 8 ++ .../organization/service/SchemeService.java | 10 +++ .../service/impl/GradeServiceImpl.java | 2 +- .../service/impl/LevelServiceImpl.java | 9 ++- .../service/impl/PostInfoServiceImpl.java | 26 ++++++- .../service/impl/PostServiceImpl.java | 10 +-- .../service/impl/SchemeServiceImpl.java | 23 ++++++ .../service/impl/SequenceServiceImpl.java | 7 +- .../organization/web/LevelController.java | 12 +++ .../organization/web/SchemeController.java | 12 +++ .../organization/wrapper/LevelWrapper.java | 5 ++ .../organization/wrapper/SchemeWrapper.java | 9 +++ 22 files changed, 202 insertions(+), 83 deletions(-) diff --git a/src/com/engine/organization/entity/postion/dto/PostDTO.java b/src/com/engine/organization/entity/postion/dto/PostDTO.java index 51de900f..b1058917 100644 --- a/src/com/engine/organization/entity/postion/dto/PostDTO.java +++ b/src/com/engine/organization/entity/postion/dto/PostDTO.java @@ -17,7 +17,6 @@ public class PostDTO { } return PostPO.builder() .id(postPO.getId() == null ? 0 : postPO.getId()) - .postNo(postPO.getPostNo() == null ? null : postPO.getPostNo()) .postName(postPO.getPostName() == null ? null : postPO.getPostName()) .description(postPO.getDescription() == null ? null : postPO.getDescription()) .deleteType(0) diff --git a/src/com/engine/organization/entity/postion/po/PostPO.java b/src/com/engine/organization/entity/postion/po/PostPO.java index e9f07b1f..292df986 100644 --- a/src/com/engine/organization/entity/postion/po/PostPO.java +++ b/src/com/engine/organization/entity/postion/po/PostPO.java @@ -22,10 +22,6 @@ public class PostPO { * 主键 */ private Long id; - /** - * 编号 - */ - private String postNo; /** * 名称 */ diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java index 6a36d9db..2934666f 100644 --- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java @@ -27,7 +27,8 @@ import lombok.NoArgsConstructor; " t.forbidden_tag," + "t.is_used", fromSql = "from jcl_org_grade t inner join jcl_org_scheme a on t.scheme_id = a.id ", - orderby = "id desc", + orderby = "grade_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(text = "编辑"), @@ -52,7 +53,7 @@ public class GradeTableVO { /** * 编号 */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no") + @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no") private String gradeNo; /** * 名称 diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java index c4c4e0e9..93c1722c 100644 --- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java +++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java @@ -30,7 +30,8 @@ import lombok.NoArgsConstructor; "t.create_time," + "t.update_time", fromSql = "FROM jcl_org_sequence t inner join jcl_org_scheme s on t.scheme_id = s.id ", - orderby = "id desc", + orderby = "sequence_no", + sortway = "asc", primarykey = "id", operates = { @OrganizationTableOperate(text = "编辑"), @@ -43,42 +44,42 @@ import lombok.NoArgsConstructor; ) public class SequenceTableVO { - /** - * 主键 - */ - @OrganizationTableColumn(column = "id", display = false) - private Long id; - /** - * 是否被引用 - */ - @OrganizationTableColumn(column = "isUsed", display = false) - private Integer isUsed; - /** - * 编号 - */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no") - private String sequenceNo; - /** - * 名称 - */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name") - private String sequenceName; + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + /** + * 是否被引用 + */ + @OrganizationTableColumn(column = "isUsed", display = false) + private Integer isUsed; + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no") + private String sequenceNo; + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name") + private String sequenceName; - /** - * 描述说明 - */ - @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description") - private String description; + /** + * 描述说明 + */ + @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description") + private String description; - /** - * 等级方案 - */ - @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") - private String schemeName; + /** + * 等级方案 + */ + @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name") + private String schemeName; - /** - * 禁用标记 - */ - @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") - private Integer forbiddenTag; + /** + * 禁用标记 + */ + @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag") + private Integer forbiddenTag; } diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index 0ec48e85..db7ab1a0 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -18,15 +18,6 @@ import java.util.Map; * @Version V1.0 **/ public interface PostMapper { - - /** - * 根据No查询职务分类 - * - * @param postNo - * @return - */ - List listByNo(@Param("postNo") String postNo); - /** * 获取职务分类根据ID * diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml index 3604960f..df766b4b 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.xml +++ b/src/com/engine/organization/mapper/post/PostMapper.xml @@ -3,7 +3,6 @@ - @@ -22,7 +21,6 @@ t . id - , t.post_no , t.post_name , t.description , t.creator @@ -37,13 +35,6 @@ from jcl_org_post t where id = #{id} AND delete_type = 0 - - - select @@ -68,6 +75,11 @@ from JCL_ORG_JOBDT where delete_type = 0 + update jcl_org_level diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.java b/src/com/engine/organization/mapper/scheme/SchemeMapper.java index e3f6ec68..ea41da19 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.java +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.java @@ -1,10 +1,12 @@ package com.engine.organization.mapper.scheme; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.po.SchemePO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -79,4 +81,10 @@ public interface SchemeMapper { * @param ids */ int deleteByIds(@Param("ids") Collection ids); + + /** + * 获取左侧树 + * @return + */ + ArrayList getTreeData(); } diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index b43994d7..daff34ff 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -13,6 +13,11 @@ + + + + + t @@ -68,6 +73,11 @@ from JCL_ORG_JOB where delete_type = 0 + diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java index dff80c24..4a8bffff 100644 --- a/src/com/engine/organization/service/LevelService.java +++ b/src/com/engine/organization/service/LevelService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.param.LevelSearchParam; import java.util.Collection; @@ -78,4 +79,11 @@ public interface LevelService { */ Map getTabInfo(); + /** + * 获取左侧树 + * + * @return + */ + TreeData getTreeData(); + } diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index ced25c40..7d5aa550 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -1,8 +1,10 @@ package com.engine.organization.service; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -70,8 +72,16 @@ public interface SchemeService { /** * 获取列表页面按钮信息 + * * @return */ Map getTableBtn(); + /** + * 获取左侧树 + * + * @return + */ + List getTreeData(); + } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index c465c0cd..d2017f94 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -210,7 +210,7 @@ public class GradeServiceImpl extends Service implements GradeService { sqlWhere += " AND t.grade_name " + dbType.like(gradeName); } String schemeId = (String) params.get("schemeId"); - if (StringUtils.isNotBlank(schemeId)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) { sqlWhere += " AND t.scheme_id = '" + schemeId + "'"; } String viewCondition = (String) params.get("viewCondition"); diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index abbf4495..dfb576cb 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -8,6 +8,7 @@ import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.TopTab; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.dto.LevelDTO; import com.engine.organization.entity.scheme.param.LevelSearchParam; import com.engine.organization.entity.scheme.po.LevelPO; @@ -183,6 +184,12 @@ public class LevelServiceImpl extends Service implements LevelService { return apiDatas; } + @Override + public TreeData getTreeData() { + ArrayList treeDataList = getLevelMapper().getTreeData(); + return TreeData.builder().children(treeDataList).title("职等").key("-1").build(); + } + /** * 查询条件 * @@ -197,7 +204,7 @@ public class LevelServiceImpl extends Service implements LevelService { sqlWhere += " AND t.level_name " + dbType.like(levelName); } String schemeId = (String) params.get("schemeId"); - if (StringUtils.isNotBlank(schemeId)) { + if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId)) { sqlWhere += " AND t.scheme_id = '" + schemeId + "'"; } String viewCondition = (String) params.get("viewCondition"); diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 1a0f7565..2f3c5bf1 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -125,11 +125,11 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postInfoName"); nameItem.setRules("required|string"); // 权限 - SearchConditionItem authorityItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "权限", "postInfoAuthority"); + SearchConditionItem authorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "权限", "postInfoAuthority"); // 责任 - SearchConditionItem dutyItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "责任", "postInfoDuty"); + SearchConditionItem dutyItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "责任", "postInfoDuty"); // 资格 - SearchConditionItem qualificationItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 2, 50, "资格", "postInfoQualification"); + SearchConditionItem qualificationItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 50, "资格", "postInfoQualification"); // 职务分类 SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser"); postIdBrowser.setRules("required|string"); @@ -172,7 +172,25 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { @Override public Map getHasRight() { - return MenuBtn.getCommonBtnDatas(); + Map btnDatas = new HashMap<>(); + ArrayList topMenuList = new ArrayList<>(); + ArrayList rightMenuList = new ArrayList<>(); + // 新增 + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addPlan").menuIcon("icon-coms-New-Flow").menuName("新增职务分类").type("BTN_AddPlan").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editPlan").menuIcon("icon-coms-edit").menuName("修改职务分类").type("BTN_EditPlan").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delPlan").menuIcon("icon-coms-Delete").menuName("删除职务分类").type("BTN_DelPlan").build()); + topMenuList.add(MenuBtn.topMenu_addNew()); + // 批量删除 + topMenuList.add(MenuBtn.topMenu_batchDelete()); + btnDatas.put("topMenu", topMenuList); + // 新增 + rightMenuList.add(MenuBtn.rightMenu_addNew()); + // 日志 + rightMenuList.add(MenuBtn.rightMenu_btnLog()); + // 显示列定制 + rightMenuList.add(MenuBtn.rightMenu_btnColumn()); + btnDatas.put("rightMenu", rightMenuList); + return btnDatas; } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 9bb6f26a..4aa59117 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -34,8 +34,8 @@ public class PostServiceImpl extends Service implements PostService { @Override public int savePost(PostPO postPO) { HasRightUtil.hasRight(user, RIGHT_NAME, false); - List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); - OrganizationAssert.isEmpty(list, "编号不允许重复"); + // List list = getPostMapper().listByNo(Util.null2String(postPO.getPostNo())); + // OrganizationAssert.isEmpty(list, "编号不允许重复"); return getPostMapper().insertIgnoreNull(PostDTO.convertPO(postPO, user.getUID())); } @@ -60,8 +60,6 @@ public class PostServiceImpl extends Service implements PostService { List addGroups = new ArrayList<>(); SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName"); 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"); // 编辑状态下赋值操作 @@ -71,12 +69,10 @@ public class PostServiceImpl extends Service implements PostService { OrganizationAssert.notNull(postPO, "选择的数据不存在，或数据已删除"); postNameItem.setValue(postPO.getPostName()); - postNoItem.setValue(postPO.getPostNo()); descriptionItem.setValue(postPO.getDescription()); } - selectItems.add(postNoItem); selectItems.add(postNameItem); selectItems.add(descriptionItem); addGroups.add(new SearchConditionGroup("基本信息", true, selectItems)); @@ -87,7 +83,7 @@ public class PostServiceImpl extends Service implements PostService { @Override public TreeData getTreeData() { ArrayList treeDataList = getPostMapper().getTreeData(); - return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build(); + return TreeData.builder().children(treeDataList).title("职务分类").key("-1").build(); } diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 6ad771c1..1d312b1b 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -5,6 +5,8 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.TreeData; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.dto.SchemeDTO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.entity.scheme.po.SchemePO; @@ -20,6 +22,7 @@ import weaver.general.StringUtil; import weaver.general.Util; import java.util.*; +import java.util.stream.Collectors; /** * @Author dxfeng @@ -151,6 +154,26 @@ public class SchemeServiceImpl extends Service implements SchemeService { return MenuBtn.getCommonBtnDatas(); } + @Override + public List getTreeData() { + ArrayList treeDataList = getSchemeMapper().getTreeData(); + TypeTreeVO build = TypeTreeVO.builder() + .childs(treeDataList.stream().map(e -> + TypeTreeVO.builder() + .domid(e.getKey()) + .key(Long.parseLong(e.getKey())) + .name(e.getTitle()) + .build()).collect(Collectors.toList())) + .haschild(true) + .domid("-1") + .key(-1L) + .name("全部方案").build(); + List typeTreeVOS = new ArrayList<>(); + typeTreeVOS.add(build); + return typeTreeVOS; + } + + /** * 查询条件 * diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 01aae2e1..fefd3d20 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -78,6 +78,11 @@ public class SequenceServiceImpl extends Service implements SequenceService { public int updateSequence(SequenceSearchParam param) { HasRightUtil.hasRight(user, RIGHT_NAME, false); SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID()); + String oldSequenceNo = getSequenceMapper().getSequenceByID(sequencePO.getId()).getSequenceNo(); + if (!oldSequenceNo.equals(sequencePO.getSequenceNo())) { + List list = getSequenceMapper().listByNo(Util.null2String(sequencePO.getSequenceNo())); + OrganizationAssert.isEmpty(list, "编号不允许重复"); + } return getSequenceMapper().updateSequence(sequencePO); } @@ -142,7 +147,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { browserBean.setReplaceDatas(maps); browserItem.setBrowserConditionParam(browserBean); // 编辑状态下,编号只读 - sequenceNoCondition.setViewAttr(1); + // sequenceNoCondition.setViewAttr(1); } selectItems.add(sequenceNoCondition); diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index fad3db68..2f9157aa 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -202,4 +202,16 @@ public class LevelController { return ReturnResult.exceptionHandle(e.getMessage()); } } + + @GET + @Path("/getTreeData") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getLevelWrapper(user).getTreeData()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } } diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index d6f815a0..b8c23fd2 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -177,5 +177,17 @@ public class SchemeController { } } + @GET + @Path("/getTreeData") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getSchemeWrapper(user).getTreeData()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java index 20c733e0..a3430d6b 100644 --- a/src/com/engine/organization/wrapper/LevelWrapper.java +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.scheme.param.LevelSearchParam; import com.engine.organization.service.LevelService; import com.engine.organization.service.impl.LevelServiceImpl; @@ -108,4 +109,8 @@ public class LevelWrapper extends Service { public Map getTabInfo() { return getLevelService(user).getTabInfo(); } + + public TreeData getTreeData() { + return getLevelService(user).getTreeData(); + } } diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index fbb0d6ab..2f8727ad 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.fieldset.vo.TypeTreeVO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.service.SchemeService; import com.engine.organization.service.impl.SchemeServiceImpl; @@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param; import weaver.hrm.User; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -74,6 +76,7 @@ public class SchemeWrapper extends Service { /** * 获取搜索条件 + * * @param params * @return */ @@ -84,6 +87,7 @@ public class SchemeWrapper extends Service { /** * 获取新增表单 + * * @param params * @return */ @@ -93,9 +97,14 @@ public class SchemeWrapper extends Service { /** * 获取列表页面按钮信息 + * * @return */ public Map getTableBtn() { return getSchemeService(user).getTableBtn(); } + + public List getTreeData() { + return getSchemeService(user).getTreeData(); + } }