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

commit

Browse Source
This commit is contained in:
Paidax
2025-04-28 08:40:55 +08:00
parent 9b9e53056f
commit d046c3be5d
144 changed files with 2559 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+7 -6
View File
@@ -128,11 +128,12 @@ public class ActivityUnionManageController {
SELECT id userId,username userName,loginname loginName,sex,mobile,unitname unitName,unionname unionName FROM `user` $condition
""");
if (!ShiroUtil.hasRole("sysadmin")) {
if (activity_type == 40002) {
cnd.and("unionId", "=", vi.getUnionId());
} else if (activity_type == 40003) {
cnd.and("id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId()));
}
// if (activity_type == 40002) {
// cnd.and("unionId", "=", vi.getUnionId());
// } else if (activity_type == 40003) {
// cnd.and("id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId()));
// }
cnd.and("unionId", "=", vi.getUnionId());
}
if (Strings.isNotBlank(serachWord)) {
@@ -218,7 +219,7 @@ public class ActivityUnionManageController {
if (tissue.getIsEnrollSystem()) {
Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
sysHomeActivity.setEnable(true);
sysHomeActivity.setEnable(ShiroUtil.hasAnyRoles("sysadmin,A06"));
activitySchoolService.dao().insertOrUpdate(sysHomeActivity);
}
return null;
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java
+2
View File
@@ -107,6 +107,8 @@ public class ActivityUnionPlanController {
activityPlan.setType("40001");
}
activityPlanService.insert(activityPlan);
return null;
}