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

Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

This commit is contained in:
dxfeng 2022-07-18 13:27:36 +08:00
parent fa663a1eaa 02f06be32f
commit 8869a18977
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/searchtree/SearchTreeParams.java
View File

@ -1,5 +1,6 @@
package com.engine.organization.entity.searchtree;
import lombok.Builder;
import lombok.Data;
/**
@ -9,6 +10,7 @@ import lombok.Data;
* @version: 1.0
*/
@Data
@Builder
public class SearchTreeParams {
/**
* 数据类型

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

@ -129,9 +129,8 @@ public class LevelServiceImpl extends Service implements LevelService {
SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
levelNoCondition.setRules("required|string");
SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "666", "schemeId", "schemeBrowser");
browserItem.setRules("required|string");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {