diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java index cecfc79..853a1bb 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java @@ -1,6 +1,7 @@ package tech.unissense.pms.business.examine.user.domain; import lombok.Data; +import tech.unissense.pms.common.core.domain.BaseEntity; import java.io.Serializable; import java.math.BigDecimal; @@ -12,7 +13,7 @@ import java.math.BigDecimal; * @since 2025-01-02 10:18:52 */ @Data -public class ExamineUser implements Serializable { +public class ExamineUser extends BaseEntity { private static final long serialVersionUID = -48380572616355554L; private Integer id; diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java index 8272eb9..e57bc72 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/service/impl/ExamineUserServiceImpl.java @@ -9,6 +9,7 @@ import tech.unissense.pms.business.examine.user.domain.ExamineUser; import tech.unissense.pms.business.examine.user.mapper.ExamineUserMapper; import tech.unissense.pms.business.examine.user.service.ExamineUserService; import org.springframework.stereotype.Service; +import tech.unissense.pms.common.annotation.DataScope; import javax.annotation.Resource; import java.math.BigDecimal; @@ -80,6 +81,7 @@ public class ExamineUserServiceImpl implements ExamineUserService { } @Override + @DataScope(deptAlias = "t2", userAlias = "t2") public List list(ExamineUser examineUser) { return examineUserMapper.list(examineUser); } diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml index b65957c..b42734e 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml @@ -97,6 +97,7 @@ and t2.dept_id = #{deptId} + ${params.dataScope} order by ifnull(manage_score,-1) ${isAsc}