c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-02-10 13:53:48 +08:00
parent 567da06823
commit 24c228e6fc
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java
+9 -5
View File
@@ -144,7 +144,8 @@ public class ActivityUnionApplyUserController {
@At
@ViReturn
@RequiresPermissions(value = {"activity.club.applyUser", "activity.union.applyUser", "activity.school.applyUser"}, logical = Logical.OR)
public Object selfUnionUsers(String groupId) {
public Object selfUnionUsers(String groupId,String tissueId) {
ActivityTissue tissue = baseService.dao().fetch(ActivityTissue.class, Cnd.where("id", "=", tissueId));
Sql sql = Sqls.create("""
SELECT
u.id,
@@ -160,7 +161,9 @@ public class ActivityUnionApplyUserController {
$condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("u.unionId", "=", Vi.getUnionId());
if (tissue.getSignUpMethod() != 3 && tissue.getType() != 40003) {
cnd.and("u.unionId", "=", Vi.getUnionId());
}
cnd.and("aus.groupId", "=", groupId);
cnd.groupBy("u.id");
cnd.asc("u.unitname").asc("u.unionname");
@@ -173,7 +176,6 @@ public class ActivityUnionApplyUserController {
@ViReturn
@RequiresPermissions(value = {"activity.club.applyUser", "activity.union.applyUser", "activity.school.applyUser"}, logical = Logical.OR)
public Object getReportedUser(String tissueId) {
ActivityTissue tissue = baseService.dao().fetch(ActivityTissue.class, Cnd.where("id", "=", tissueId));
Sql sql = Sqls.create("""
SELECT
atp.userId
@@ -184,9 +186,11 @@ public class ActivityUnionApplyUserController {
""");
Cnd cnd = Cnd.NEW();
cnd.and("atp.tissueId", "=", tissueId);
if (tissue.getSignUpMethod() != 3 && tissue.getType() != 40003) {
cnd.and("atp.applyUserId", "=", ShiroUtil.getUserId());
/* if (tissue.getSignUpMethod() != 3 && tissue.getType() != 40003) {
cnd.and("u.unionid", "=", Vi.getUnionId());
}
}*/
sql.setCondition(cnd);
List<NutMap> list = baseService.listMap(sql);
List<String> userIds = list.stream().map(v -> v.getString("userId")).collect(Collectors.toList());
return userIds;