2024/1/4 小程序实验室查询过滤

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/SubQueryManager.java

@@ -130,15 +130,16 @@ public class SubQueryManager {
      */
     public  List<SubDiyVO> queryAppSubs(LabSubject labSubject, SubQueryConfig subQueryConfig) {
         List<LabSubjectVO> labSubjectVOS = null;
+        if(!tokenService.getLoginUser().getUsername().equals("admin")){
+            labSubject.setLoginUserId(tokenService.getLoginUser().getUserid());
+        }
         //数据和业务权限
         if(SubQueryConfig.mode.data_business.equals(subQueryConfig.getQueryMode()))
         {
-            labSubject.setLoginUserId(tokenService.getLoginUser().getUserid());
             labSubjectVOS = labSubjectService.selectLabSubjectListAUTH(labSubject);
         }
         else if(SubQueryConfig.mode.data.equals(subQueryConfig.getQueryMode()))
         {
-            labSubject.setLoginUserId(tokenService.getLoginUser().getUserid());
             labSubjectVOS = labSubjectService.selectLabSubjectListDataScope(labSubject);
         }
         else if(SubQueryConfig.mode.business.equals(subQueryConfig.getQueryMode()))
@@ -147,7 +148,6 @@ public class SubQueryManager {
             throw new ServiceException("查询参数错误！！！");
         }else if(SubQueryConfig.mode.none.equals(subQueryConfig.getQueryMode()))
         {
-            labSubject.setLoginUserId(tokenService.getLoginUser().getUserid());
             labSubjectVOS = subjectMapper.selectLabAppSubjectVOList(labSubject);
         }else
         {