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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java

@@ -5,6 +5,7 @@
import com.doumee.core.constants.OperaType;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.CompanyDepartment;
import com.doumee.dao.business.model.CompanyPermission;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -114,16 +115,32 @@
    @TableField(exist = false)
    private Integer authNum;

    @ApiModelProperty(value = "所属企业信息对")
    @ApiModelProperty(value = "是否主管 0否 1是", example = "1")
    @TableField(exist = false)
    private Integer headStatus;

    @ApiModelProperty(value = "所属企业信息")
    @TableField(exist = false)
    private Company company;


    @ApiModelProperty(value = "展示的企业信息")
    @TableField(exist = false)
    private Company showCompany;


    @ApiModelProperty(value = "所属组织对象")
    @TableField(exist = false)
    private CompanyDepartment department;
    private CompanyDepartment companyDepartment;

    @ApiModelProperty(value = "平台管理员权限内企业编码集合")
    @TableField(exist = false)
    private List<Integer> companyIdList;

    @ApiModelProperty(value = "企业用户 - 可查看组织数据")
    @TableField(exist = false)
    private List<CompanyPermission> companyPermissionList;

    @ApiModelProperty(value = "数据权限内组织编码集合")
    @TableField(exist = false)
    private List<Integer> departIdList;