diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleOrgDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleOrgDTO.java deleted file mode 100644 index 8c68976b..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleOrgDTO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.bonus.canteen.core.auth.role.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@ApiModel("组织权限") -@Data -public class MgrRoleOrgDTO { - @ApiModelProperty("区域、食堂、档口ID") - private Long orgId; - @ApiModelProperty("节点状态：1全选；2半选") - private Integer halfSelect; - - public Long getOrgId() { - return this.orgId; - } - - public Integer getHalfSelect() { - return this.halfSelect; - } - - public void setOrgId(final Long orgId) { - this.orgId = orgId; - } - - public void setHalfSelect(final Integer halfSelect) { - this.halfSelect = halfSelect; - } - - public boolean equals(final Object o) { - if (o == this) { - return true; - } else if (!(o instanceof MgrRoleOrgDTO)) { - return false; - } else { - MgrRoleOrgDTO other = (MgrRoleOrgDTO)o; - if (!other.canEqual(this)) { - return false; - } else { - Object this$orgId = this.getOrgId(); - Object other$orgId = other.getOrgId(); - if (this$orgId == null) { - if (other$orgId != null) { - return false; - } - } else if (!this$orgId.equals(other$orgId)) { - return false; - } - - Object this$halfSelect = this.getHalfSelect(); - Object other$halfSelect = other.getHalfSelect(); - if (this$halfSelect == null) { - if (other$halfSelect != null) { - return false; - } - } else if (!this$halfSelect.equals(other$halfSelect)) { - return false; - } - - return true; - } - } - } - - protected boolean canEqual(final Object other) { - return other instanceof MgrRoleOrgDTO; - } - - - public String toString() { - Long var10000 = this.getOrgId(); - return "MgrRoleOrgDTO(orgId=" + var10000 + ", halfSelect=" + this.getHalfSelect() + ")"; - } - - public MgrRoleOrgDTO(final Long orgId, final Integer halfSelect) { - this.orgId = orgId; - this.halfSelect = halfSelect; - } - - public MgrRoleOrgDTO() { - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserDTO.java deleted file mode 100644 index 3f6ccc1d..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserDTO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.bonus.canteen.core.auth.role.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -@ApiModel("指定角色人员") -public class MgrRoleUserDTO { - @ApiModelProperty("角色标识") - private String roleCode; - @ApiModelProperty("删除标识") - private Integer delFlag; - - public String getRoleCode() { - return this.roleCode; - } - - public Integer getDelFlag() { - return this.delFlag; - } - - public void setRoleCode(final String roleCode) { - this.roleCode = roleCode; - } - - public void setDelFlag(final Integer delFlag) { - this.delFlag = delFlag; - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserListDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserListDTO.java deleted file mode 100644 index aa0d1c34..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/dto/MgrRoleUserListDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bonus.canteen.core.auth.role.dto; - -import io.swagger.annotations.ApiModelProperty; - -public class MgrRoleUserListDTO { - @ApiModelProperty("角色标识(ROLE_BUYER-采购员,ROLE_KEEPER-仓库管理员)") - private String roleCode; - - public String getRoleCode() { - return this.roleCode; - } - - public void setRoleCode(final String roleCode) { - this.roleCode = roleCode; - } - -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java index f3c1ddaa..f3f8571e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/mapper/MgrRoleOrgMapper.java @@ -2,7 +2,6 @@ package com.bonus.canteen.core.auth.role.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bonus.canteen.core.auth.po.MgrUserAuthPO; -import com.bonus.canteen.core.auth.role.dto.MgrRoleOrgDTO; import com.bonus.canteen.core.auth.role.entity.MgrRoleOrg; import com.bonus.canteen.core.customer.dto.CustOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -12,7 +11,6 @@ import java.util.List; @Mapper public interface MgrRoleOrgMapper extends BaseMapper { - int insertBatch(@Param("roleId") Long roleId, @Param("orgList") List orgList); List getTenantOrg(@Param("excludeMiddle") Integer excludeMiddle, @Param("authPO") MgrUserAuthPO mgrUserAuthPO, @Param("delFlag") Integer delFlag); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/vo/MgrRoleUserVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/vo/MgrRoleUserVO.java deleted file mode 100644 index 714a3484..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/role/vo/MgrRoleUserVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.bonus.canteen.core.auth.role.vo; - -import com.bonus.canteen.core.common.encrypt.LeNiuDecryptDataProcess; -import com.bonus.canteen.core.common.encrypt.LeNiuDecryptField; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -@ApiModel("指定角色人员") -@LeNiuDecryptDataProcess -public class MgrRoleUserVO { - @ApiModelProperty("用户编号") - private Long userId; - @ApiModelProperty("用户名") - private String username; - @ApiModelProperty("真实姓名") - @LeNiuDecryptField - private String realName; - - public Long getUserId() { - return this.userId; - } - - public String getUsername() { - return this.username; - } - - public String getRealName() { - return this.realName; - } - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public void setUsername(final String username) { - this.username = username; - } - - public void setRealName(final String realName) { - this.realName = realName; - } - -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml deleted file mode 100644 index 43c6c985..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrUserMapper.xml +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml index b7663ae6..8c1d9e83 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/role/MgrRoleOrgMapper.xml @@ -1,13 +1,6 @@ - - insert into sys_role_dept - values - - (#{roleId}, #{org.orgId}) - -