kongdeqiang
2024-04-09 4a620557ffb98adfb0d3dbea16cf4bdb9bfd916f
fix: 修改前端过滤验证码
2个文件已修改
25 ■■■■■ 已修改文件
xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-core/src/main/java/cn/exrick/xboot/core/config/security/WebSecurityConfig.java
@@ -133,7 +133,7 @@
                .exceptionHandling().accessDeniedHandler(accessDeniedHandler)
                .and()
                //图形验证码过滤器
                .addFilterBefore(imageValidateFilter, UsernamePasswordAuthenticationFilter.class)
                //.addFilterBefore(imageValidateFilter, UsernamePasswordAuthenticationFilter.class)
                // 短信验证码过滤器
                //.addFilterBefore(smsValidateFilter, UsernamePasswordAuthenticationFilter.class)
                // vaptcha验证码过滤器
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -33,6 +33,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/**
 * @author whj
@@ -199,14 +200,20 @@
        Map<String, Object> map = new HashMap<String, Object>();
        map.put("count", list.size());
        map.put("sum", sum);
        map.put("name", "");
        if (list.size() > 0) {
            OrderTask orderTask = list.get(0);
            String areaSectionId = orderTask.getAreaSectionId();
            AreaSection a = iAreaSectionService.getById(areaSectionId);
            Area area2 = iAreaService.getById(orderTask.getAreaId());
            map.put("name", area2.getName() + a.getName());
            list.clear();
        String name = area.getName();
        Map<String, List<OrderTask>> collect = list.stream().collect(Collectors.groupingBy(OrderTask::getAreaSectionId));
        for (Map.Entry<String, List<OrderTask>> stringListEntry : collect.entrySet()) {
            String key = stringListEntry.getKey();
            List<OrderTask> value = stringListEntry.getValue();
            if(value.size()>0){
                AreaSection a = iAreaSectionService.getById(key);
                name+=a.getName();
            }
        }
        if(name.equals(area.getName())){
            map.put("name", "");
        }else {
            map.put("name", name);
        }
        return new ResultUtil<Object>().setData(map);
    }