日志权限修改

user_center/src/main/java/com/huaxu/controller/LoginLogController.java

@@ -26,6 +26,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @description 登录日志管理控制层
@@ -141,7 +142,12 @@ public class LoginLogController {
         loginLogDto.setTenantId(loginUser.getTenantId());
         loginLogDto.setCondition(condition);
         loginLogDto.setDepartmentId(departmentId);
-        loginLogDto.setProgramItems(loginUser.getProgramItemList());
+
+        //系统管理员不过滤权限，机构信息为null的去掉
+        if((!loginUser.getType().equals("-9999")) && !loginUser.getType().equals("-999")   ){
+            loginLogDto.setProgramItems(loginUser.getProgramItemList().stream().filter(p -> p.getOrgId() != null).collect(Collectors.toList()));
+        }
+
         try {
             if(StringUtils.isNotBlank(beginTime)){
                 loginLogDto.setBeginTime(f.parse(beginTime));

user_center/src/main/java/com/huaxu/controller/OperateLogController.java

@@ -23,6 +23,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @description
@@ -136,7 +137,11 @@ public class OperateLogController {
         operateLogDto.setTenantId(loginUser.getTenantId());
         operateLogDto.setCondition(condition);
         operateLogDto.setDepartmentId(departmentId);
-        operateLogDto.setProgramItems(loginUser.getProgramItemList());
+        //系统管理员不过滤权限，数据为null的去掉
+        if((!loginUser.getType().equals("-9999")) && !loginUser.getType().equals("-999")   ){
+            operateLogDto.setProgramItems(loginUser.getProgramItemList().stream().filter(p -> p.getOrgId() != null).collect(Collectors.toList()));
+        }
+
         try {
             if(StringUtils.isNotBlank(beginTime)){
                 operateLogDto.setBeginTime(f.parse(beginTime));