修改bug

src/main/java/cn/chnmuseum/party/model/Audit.java

@@ -119,4 +119,12 @@ public class Audit implements Serializable {
     @TableField(exist = false)
     private String auditName;
 
+
+    @TableField(exist = false)
+    private Boolean one;
+
+
+    @TableField(exist = false)
+    private Boolean two;
+
 }

src/main/java/cn/chnmuseum/party/web/controller/AuditController.java

@@ -65,6 +65,8 @@ public class AuditController extends BaseController {
     @MethodLog(operModule = OperModule.RECHECK, operType = OperType.SELECT)
     public Map<String, Object> getUserList(String name, String status, String level) {
         Page<Audit> auditList;
+        Boolean one = true;
+        Boolean two = true;
         try {
             TUser user1 = getcurUser();
             TUser user = new TUser();
@@ -81,8 +83,16 @@ public class AuditController extends BaseController {
             if (!user1.getRoleList().contains("1")) {
                 if (user1.getRoleList().contains("15")) {
                     user.setAuditStatus(AuditStatusEnum.TBC.name());
+                    one = true;
+                    if (user.getRoleList().contains("16")) {
+                        two = true;
+                    }
                 } else if (user1.getRoleList().contains("16")) {
                     user.setAuditStatus(AuditStatusEnum.TBCA.name());
+                    two = true;
+                    if (user.getRoleList().contains("15")) {
+                        one = true;
+                    }
                 } else {
                     //不存在的层级
                     user.setAuditStatus("1");
@@ -90,6 +100,10 @@ public class AuditController extends BaseController {
             }
             user.setId(user1.getId());
             auditList = auditService.getUserList(getPage(), user);
+            for (Audit record : auditList.getRecords()) {
+                record.setOne(one);
+                record.setTwo(two);
+            }
             return getResult(auditList);
         } catch (Exception e) {
             e.printStackTrace();
@@ -230,15 +244,28 @@ public class AuditController extends BaseController {
         AuditStatusEnum auditStatus = null;
         AuditStatusEnum auditStatusLevel = null;
         AuditTypeEnum auditTypeEnum = AuditTypeEnum.valueOf(type);
+        Boolean one = true;
+        Boolean two = true;
 //数据权限，暂时注释
         TUser user = getcurUser();
         if (!user.getRoleList().contains("1")) {
+            one = false;
+            two = false;
             switch (auditTypeEnum) {
                 case VIDEO_CONTENT:
                     if (user.getRoleList().contains("9")) {
                         auditStatusLevel = AuditStatusEnum.TBC;
+                        one = true;
+                        if (user.getRoleList().contains("10")) {
+                            two = true;
+                        }
                     } else if (user.getRoleList().contains("10")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
+                        two = true;
+                        auditStatusLevel = AuditStatusEnum.TBC;
+                        if (user.getRoleList().contains("9")) {
+                            one = true;
+                        }
                     } else {
                         auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
                     }
@@ -246,8 +273,17 @@ public class AuditController extends BaseController {
                 case EXHIBITION_BOARD:
                     if (user.getRoleList().contains("11")) {
                         auditStatusLevel = AuditStatusEnum.TBC;
+                        one = true;
+                        if (user.getRoleList().contains("12")) {
+                            two = true;
+                        }
                     } else if (user.getRoleList().contains("12")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
+                        two = true;
+                        auditStatusLevel = AuditStatusEnum.TBC;
+                        if (user.getRoleList().contains("11")) {
+                            one = true;
+                        }
                     } else {
                         auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
                     }
@@ -255,8 +291,17 @@ public class AuditController extends BaseController {
                 case LEARNING_CONTENT:
                     if (user.getRoleList().contains("13")) {
                         auditStatusLevel = AuditStatusEnum.TBC;
+                        one = true;
+                        if (user.getRoleList().contains("14")) {
+                            two = true;
+                        }
                     } else if (user.getRoleList().contains("14")) {
                         auditStatusLevel = AuditStatusEnum.TBCA;
+                        two = true;
+                        auditStatusLevel = AuditStatusEnum.TBC;
+                        if (user.getRoleList().contains("13")) {
+                            one = true;
+                        }
                     } else {
                         auditStatusLevel = AuditStatusEnum.APPROVED_FINAL;
                     }
@@ -267,8 +312,11 @@ public class AuditController extends BaseController {
             auditStatus = AuditStatusEnum.valueOf(status);
         }
         try {
-
             Page<Audit> auditList = auditService.pageList(name, auditStatus, auditStatusLevel, auditTypeEnum, getPage(), user.getId());
+            for (Audit record : auditList.getRecords()) {
+                record.setOne(one);
+                record.setTwo(two);
+            }
             return getResult(auditList);
         } catch (Exception e) {
             e.printStackTrace();