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

박지현

2022-03-07 398a4927e195755bd6a46be99337efd8dacc3dc2

 src/main/java/kr/wisestone/owl/web/form/IssueTypeForm.java

@@ -1,13 +1,9 @@
package kr.wisestone.owl.web.form;

import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.UseCompany;
import kr.wisestone.owl.domain.HostingField;
import kr.wisestone.owl.domain.IssueType;
import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.HostingFieldCondition;
import kr.wisestone.owl.web.controller.HostingFieldController;

import java.util.List;
import java.util.Map;
@@ -23,7 +19,8 @@
    private Long workflowId;
    private Long projectId;
    private List<Long> removeIds = Lists.newArrayList();
    private Long useCompany;
    private Long usePartner;
    private Boolean inheritPartners;

    public IssueTypeForm(){}

@@ -37,14 +34,22 @@
        if (MapUtil.getLongs(params, "companyIds") != null) {
//            form.setRemoveIds(MapUtil.getLongs(params, "companyIds"));
            List<Long> longs = MapUtil.getLongs(params, "companyIds");
            form.useCompany = 0L;
            form.usePartner = 0L;

            for (Long id : longs) {
                if (id == UseCompany.USE_COMPANY_COMPANY - 1) {
                    form.useCompany += 1;
                if (id == UsePartner.USE_PARTNER_COMPANY - 1) {
                    form.usePartner += 1;
                } else {
                    form.useCompany += id * 2;
                    form.usePartner += id * 2;
                }
            }
        }

        if (MapUtil.getString(params, "inheritPartners") != null) {
            if (MapUtil.getString(params, "inheritPartners").equals("true")) {
                form.setInheritPartners(true);
            } else {
                form.setInheritPartners(false);
            }
        }

@@ -111,11 +116,19 @@
        this.projectId = projectId;
    }

    public Long getUseCompany() {
        return useCompany;
    public Long getUsePartner() {
        return usePartner;
    }

    public void setUseCompany(Long useCompany) {
        this.useCompany = useCompany;
    public void setUsePartner(Long usePartner) {
        this.usePartner = usePartner;
    }

    public Boolean getInheritPartners() {
        return inheritPartners;
    }

    public void setInheritPartners(Boolean inheritPartners) {
        this.inheritPartners = inheritPartners;
    }
}