功能修改

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java

@@ -32,6 +32,11 @@ public interface TenantConstants {
      */
     String TENANT_ADMIN_ROLE_KEY = "admin";
 
+    /**
+     * 租户学校角色 roleKey
+     */
+    String TENANT_SCHOOL_ROLE_KEY = "school";
+
     /**
      * 租户管理员角色名称
      */

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -168,4 +168,18 @@ public class LoginHelper {
         return isTenantAdmin(getLoginUser().getRolePermission());
     }
 
+    /**
+     * 是否为school
+     *
+     * @param rolePermission 角色权限标识组
+     * @return 结果
+     */
+    public static boolean isTenantSchool(Set<String> rolePermission) {
+        return rolePermission.contains(TenantConstants.TENANT_SCHOOL_ROLE_KEY);
+    }
+
+    public static boolean isTenantSchool() {
+        return isTenantSchool(getLoginUser().getRolePermission());
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/pay/XiaoyuanPayServiceImpl.java

@@ -53,8 +53,10 @@ public class XiaoyuanPayServiceImpl implements IXiaoyuanPayService {
     public Page<XiaoyuanPayVo> queryPageList(XiaoyuanPayBo bo, PageQuery pageQuery) {
 
         //todo 获取自己的工号 如果是当前有学校角色,则不获取
-        String username = LoginHelper.getLoginUser().getUsername();
-        bo.setTeacherNum(username);
+        if(!LoginHelper.isSuperAdmin() && !LoginHelper.isTenantSchool()){
+            String username = LoginHelper.getLoginUser().getUsername();
+            bo.setTeacherNum(username);
+        }
         LambdaQueryWrapper<XiaoyuanPay> lqw = buildQueryWrapper(bo);
         Page<XiaoyuanPayVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         //处理的返回值List
@@ -110,7 +112,7 @@ public class XiaoyuanPayServiceImpl implements IXiaoyuanPayService {
     private LambdaQueryWrapper<XiaoyuanPay> buildQueryWrapper(XiaoyuanPayBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<XiaoyuanPay> lqw = Wrappers.lambdaQuery();
-        lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), XiaoyuanPay::getTeacherName, bo.getTeacherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTeacherNum()), XiaoyuanPay::getTeacherNum, bo.getTeacherNum());
         lqw.eq(bo.getTeacherId() != null, XiaoyuanPay::getTeacherId, bo.getTeacherId());
         lqw.eq(StringUtils.isNotBlank(bo.getTableHead()), XiaoyuanPay::getTableHead, bo.getTableHead());
         lqw.eq(StringUtils.isNotBlank(bo.getTableDetail()), XiaoyuanPay::getTableDetail, bo.getTableDetail());