Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-17 6d55fcdcb200796a80025d9dee4e3378bb0c0c71

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -195,9 +195,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null,"1");
        int num=IUserService.selectNum(null,keyword,null,"1");
        return getDataTable(list,num);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -168,8 +168,6 @@
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent=new ComEvent();
        BeanUtils.copyProperties(comEventVO, comEvent);
        log.info("==================参数vo"+comEventVO);
        log.info("==================参数comEvent"+comEvent);
        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
        if (isNull(comEventVO.getAppId())){
            String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -353,6 +353,8 @@
        QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
        wrapper.eq("level",level);
        wrapper.eq("app_id",appId);
        wrapper.eq("status",1 );
        wrapper.eq("del_flag",1 );
        if (level.equals(2)){
            wrapper.eq("industry_center_id", id);
        }else if (level.equals(3)){

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -62,7 +62,7 @@
                AND    ( order_sn like concat ('%',#{comEvent.keyword},'%')  or request_user_tel like concat ('%',#{comEvent.keyword},'%') or current_org_name like concat ('%',#{comEvent.keyword},'%'))
            </if>
            <if test="comEvent.startTime != null and comEvent.startTime != ''">
                AND create_at between DATA_FORMAT(#{comEvent.startTime},'%Y-%m-%d 00:00:00') and DATA_FORMAT(#{comEvent.endTime},'%Y-%m-%d 00:00:00')
                AND create_at between DATE_FORMAT(#{comEvent.startTime},'%Y-%m-%d 00:00:00') and DATE_FORMAT(#{comEvent.endTime},'%Y-%m-%d 00:00:00')
            </if>
            <if test="comEvent.createBy != null and comEvent.createBy!=''" >
                AND create_by = #{comEvent.createBy}