Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

박지현

2022-03-07 398a4927e195755bd6a46be99337efd8dacc3dc2

 src/main/java/kr/wisestone/owl/web/condition/UserCondition.java

@@ -25,14 +25,17 @@
    private Integer pageSize;
    private Long loginUserId;
    private Long workspaceId;
    private Integer permission;
//    private Integer permission;
    private String licensekey;

    public static UserCondition make(Map<String, Object> conditions) {
        UserCondition condition = ConvertUtil.convertMapToClass(conditions, UserCondition.class);
        condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
        condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));

        if (MapUtil.getStrings(conditions, "statuses") != null) {
            condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
        }
        if (MapUtil.getStrings(conditions, "excludeIds") != null) {
            condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
        }
        return condition;
    }

@@ -144,13 +147,13 @@
        this.deep = deep;
    }

    public Integer getPermission() {
        return permission;
    }

    public void setPermission(Integer permission) {
        this.permission = permission;
    }
//    public Integer getPermission() {
//        return permission;
//    }
//
//    public void setPermission(Integer permission) {
//        this.permission = permission;
//    }

    public String getLicensekey() {
        return licensekey;