commit

src/main/java/com/budwk/app/zhgh/activity/basic/models/ActivityUserScope.java

@@ -3,7 +3,6 @@ package com.budwk.app.zhgh.activity.basic.models;
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 import org.nutz.dao.entity.annotation.*;
 
 import java.io.Serial;
@@ -16,9 +15,13 @@ import java.io.Serializable;
  */
 
 @EqualsAndHashCode(callSuper = true)
-@Table
+@Table("activity_user_scope")
 @Data
 @Comment("活动人员范围设置")
+@TableIndexes({
+        @Index(name = "INDEX_ACTIVITY_USER_SCOPE_GROUPID", fields = {"groupId"}, unique = false),
+        @Index(name = "INDEX_ACTIVITY_USER_SCOPE_USERID", fields = {"userId"}, unique = false)
+})
 public class ActivityUserScope extends BaseModel implements Serializable {
 
     @Serial

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java

@@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
@@ -161,7 +160,9 @@ public class ActivityCultureUserStatisticsController {
             }
         }
         // 只查询流程实例状态为20的数据（已完成状态）
-        cnd.and("ins.state", "=", 20);
+        if (!List.of(40001).contains(activity_type)) {
+            cnd.and("ins.state", "=", 20);
+        }
         cnd.andEX("YEAR(tissue.startTime)", "=", year).desc("tissue.startTime");
         sql.setCondition(cnd);
         return Result.success(activityCultureApplyUserService.list(sql));

src/main/java/com/budwk/app/zhgh/dayofficework/asset/controller/AssetStocktakingController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.dayofficework.asset.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
@@ -39,11 +40,16 @@ public class AssetStocktakingController {
     @SaCheckPermission("asset.stocktaking")
     public void index() {
     }
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/dayofficework/asset/stocktaking/index.html")
+    @SaCheckPermission("h5.asset.stocktaking")
+    public void h5Index() {
+    }
 
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission("asset.stocktaking")
+    @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR)
     public Result pageData(AssetPageForm pageForm) {
         Sql sql = assetStocktakingService.getSql(pageForm);
         Pagination pagination = assetStocktakingService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
@@ -54,7 +60,7 @@ public class AssetStocktakingController {
     @ApiOperation("资产盘点提交")
     @Aop(TransAop.READ_COMMITTED)
     @SLog(type = "AssetStocktaking", tag = "资产盘点", msg = "提交了一条资产盘点信息")
-    @SaCheckPermission("asset.stocktaking")
+    @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR)
     public Result doSubmit(AssetStocktaking assetStocktaking) {
 
         assetStocktakingService.doSubmit(assetStocktaking);
@@ -66,7 +72,7 @@ public class AssetStocktakingController {
     @ApiOperation("删除资产盘点")
     @Aop(TransAop.READ_COMMITTED)
     @SLog(type = "AssetStocktaking", tag = "资产盘点", msg = "删除了一条资产盘点信息")
-    @SaCheckPermission("asset.stocktaking")
+    @SaCheckPermission(value = {"asset.stocktaking","h5.asset.stocktaking"}, mode = SaMode.OR)
     public Result doDelete(String id,String assetStocktakingPlanId) {
         assetStocktakingService.doDelete(id,assetStocktakingPlanId);
         return Result.success();