yys

云

6 天以前 e885a8a5cdd4f7496765c82d81dc9a7fa58739cc

yys

 src/main/java/com/ruoyi/common/aop/DataScope.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.ruoyi.common.aop;

import java.lang.annotation.*;

/**
 * æ•°æ®æƒé™æ³¨è§£
 * æ ‡è®°éœ€è¦è¿›è¡Œæ•°æ®éš”离的Mapper方法
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DataScope {

    /**
     * éƒ¨é—¨è¡¨çš„别名
     */
    String deptAlias() default "";

    /**
     * ç”¨æˆ·è¡¨çš„别名（对应create_user字段所在表）
     */
    String userAlias() default "";

    /**
     * æ˜¯å¦è¿‡æ»¤åˆ›å»ºäººï¼ˆé»˜è®¤true，即根据create_user过滤）
     */
    boolean isFilterCreateUser() default true;
}

 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java

@@ -64,12 +64,12 @@
            return AjaxResult.error("请选择至少一条数据");
        }
        //如果已经提交就不允许删除
        List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
        for (QualityInspect qualityInspect : qualityInspects) {
            if(qualityInspect.getInspectState()==1){
               throw new RuntimeException("已提交的数据不允许删除");
            }
        }
//        List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
//        for (QualityInspect qualityInspect : qualityInspects) {
//            if(qualityInspect.getInspectState() != null && qualityInspect.getInspectState()==1){
//               throw new RuntimeException("已提交的数据不允许删除");
//            }
//        }
        //删除检验参数
        qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
        .in(QualityInspectParam::getInspectId,ids));

 src/main/resources/application-dev.yml

@@ -146,7 +146,7 @@
  # redis é…ç½®
  redis:
    # åœ°å€
    host: 127.0.0.1
    host: localhost
    #    host: 172.17.0.1
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379