diff --git a/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java b/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java index f2347d85..dd6e8f8f 100644 --- a/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java +++ b/src/main/java/com/xujie/sys/modules/auth/controller/AuthController.java @@ -133,15 +133,6 @@ public class AuthController { public R getAuthGroupBusinessList(@RequestBody AuthGroupData data) { List row1 = authGroupMemberService.authGroupBusinessSearch(data); List row2 = authGroupMemberService.authGroupBusinessSearch2(data); - // 将rows中row2的数据排除 - for (AuthGroupMemberDataVo row : row2) { - for (int i = 0; i < row1.size(); i++) { - if (row1.get(i).getUserId().equals(row.getUserId())) { - row1.remove(i); - break; - } - } - } return R.ok().put("row1", row1).put("row2", row2); } diff --git a/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java b/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java index c6b6c764..12692767 100644 --- a/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java +++ b/src/main/java/com/xujie/sys/modules/auth/data/AuthHistData.java @@ -77,5 +77,8 @@ public class AuthHistData implements Serializable { @TableField(exist = false) private Integer userId; + @TableField(exist = false) + private Boolean isSimultaneous; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java b/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java index 599f18d6..724e9fba 100644 --- a/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java +++ b/src/main/java/com/xujie/sys/modules/auth/mapper/AuthHistMapper.java @@ -17,7 +17,6 @@ public interface AuthHistMapper extends BaseMapper { List searchAuthInfo(AuthHistData data); - void authMailSend(String emails); } diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java index 6af62952..c1361520 100644 --- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java @@ -55,7 +55,7 @@ public class AuthHistServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); diff --git a/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml b/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml index 14f3a601..9c9cb42d 100644 --- a/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml +++ b/src/main/resources/mapper/auth/AuthGroupMemberMapper.xml @@ -5,7 +5,7 @@