Merge remote-tracking branch 'origin/tzmsewcs' into tzmsewcs

zhang

2025-06-13 ae54e42cbe354ef5c39954eed2eab18de9504946

 src/main/java/com/zy/system/entity/Role.java

@@ -46,7 +46,8 @@
    @ApiModelProperty(value= "角色等级 1: 一级  2: 二级  3: 三级  4: 四级  5: 五级  ")
    private Short level;

    public Role() {}
    public Role() {
    }

    public Role(String code,String name,Long leader,Short level) {
        this.code = code;
@@ -90,6 +91,10 @@
        return leader;
    }

    public void setLeader(Long leader) {
        this.leader = leader;
    }

    public String getLeader$(){
        RoleService service = SpringUtils.getBean(RoleService.class);
        Role role = service.selectById(this.leader);
@@ -99,16 +104,18 @@
        return null;
    }

    public void setLeader(Long leader) {
        this.leader = leader;
    }

    public Short getLevel() {
        return level;
    }

    public void setLevel(Short level) {
        this.level = level;
    }

    public String getLevel$(){
        if (null == this.level){ return null; }
        if (null == this.level) {
            return null;
        }
        switch (this.level){
            case 1:
                return "一级";
@@ -123,10 +130,6 @@
            default:
                return String.valueOf(this.level);
        }
    }

    public void setLevel(Short level) {
        this.level = level;
    }