commit

src/main/java/com/budwk/app/flow/listenter/ProcessTaskStartEventListener.java

@@ -66,9 +66,7 @@ public class ProcessTaskStartEventListener implements ProcessEventListener {
             // 模拟发送消息
             String message = StrUtil.format("您有一条待办任务，实例：{}，处理环节：{}", instanceName, taskDisplayName);
             log.info(message);
-            if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
+
-                break;
-            }
             JSONObject config = new JSONObject();
             config.set("pcUrl", Globals.AppDomain + task.getFormKey());
             config.set("mobileUrl", Globals.AppDomain + task.getH5FormKey());

src/main/java/com/budwk/app/todo/service/impl/TodoServiceImpl.java

@@ -61,9 +61,6 @@ public class TodoServiceImpl implements TodoService {
 
 	@Override
 	public void saveTask(ProcessTask task) {
-		if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
-			return;
-		}
 		log.info("新增待办任务，任务数据：{}", Json.toJson(task));
 		try {
 			// 获取待办实例
@@ -134,9 +131,6 @@ public class TodoServiceImpl implements TodoService {
 
 	@Override
 	public void updateTask(ProcessTask task) {
-		if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
-			return;
-		}
 		log.info("更新待办任务，任务数据：{}", Json.toJson(task));
 		try {
 			// 获取待办实例
@@ -184,9 +178,6 @@ public class TodoServiceImpl implements TodoService {
 
 	@Override
 	public void modifyInfo(ProcessTask task) {
-		if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
-			return;
-		}
 		log.info("修改待办任务，任务数据：{}", Json.toJson(task));
 		try {
 			// 创建客户端
@@ -208,9 +199,6 @@ public class TodoServiceImpl implements TodoService {
 
 	@Override
 	public void deleteTask(String taskId) {
-		if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
-			return;
-		}
 		log.info("删除待办任务，任务ID：{}", taskId);
 		try {
 			// 创建客户端
@@ -229,9 +217,6 @@ public class TodoServiceImpl implements TodoService {
 
 	@Override
 	public void deleteProcessInstance(String processInstanceId) {
-		if (!List.of("superadmin" ,"CS2025015", "20182040").contains(SecurityUtil.getUserLoginname())) {
-			return;
-		}
 		log.info("删除待办流程，实例ID：{}", processInstanceId);
 		try {
 			// 创建客户端

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java

@@ -6,11 +6,18 @@ import com.budwk.app.base.param.PageForm;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.declarereimbursement.enums.ActivityDeclareReimbursement;
+import com.budwk.app.zhgh.club.model.SysClub;
+import com.budwk.app.zhgh.club.service.SysClubService;
+import com.budwk.app.zhgh.club.service.impl.SysClubServiceImpl;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.lang.Lang;
+import org.nutz.mvc.Mvcs;
+
+import java.util.List;
 
 /**
  * @version 1.0
@@ -59,7 +66,11 @@ public class CommonPageParam extends PageForm {
             }
             if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name())) {
 //                cnd.and(prefix + "clubId", "=", );
-                group.or(prefix + "clubId", "in", SecurityUtil.getClubIds());
+                SysClubService clubService = Mvcs.getIoc().get(SysClubServiceImpl.class);
+                List<SysClub> clubList = clubService.getMyManageClub();
+                if(Lang.isNotEmpty(clubList)) {
+                    group.or(prefix + "clubId", "in", clubList.stream().map(SysClub::getId).toList());
+                }
             }
             group.or(prefix + "userId", "=", SecurityUtil.getUserId());
             cnd.and(group);

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -137,7 +137,6 @@ public class CondolenceMineController {
 		CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, Cnd.where(CondolenceType::getId, "=", condolence.getType()));
 		NutMap nutMap = Lang.obj2nutmap(condolence);
 		nutMap.put("typeName", type.getName());
-		//smsService.send("20182040", "这是一条由智慧工会系统发出的测试消息。");
 		return Result.success(nutMap);
 	}
 	@Inject