仁和社区修改

101captain

2022-01-17 3b53e7f07f5ce3d8235652c22faf814fd387755f

仁和社区修改

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java

@@ -129,6 +129,7 @@
            operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
            operlog.setOperTime(new Date()); // 创建时间
            operlog.setAccount(loginUserInfoVO.getAccount());
            operlog.setAreaCode(loginUserInfoVO.getAreaCode());
            Long communityId = loginUserInfoVO.getCommunityId();
            operlog.setCommunityId(null == communityId ? 0 : communityId);
            userService.addOperLog(operlog);

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java

@@ -336,6 +336,7 @@
    @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/page")
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
        pageConvenientMerchantDTO.setAreaCode(this.getAreaCode());
        return communityService.pageMerchant(pageConvenientMerchantDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java

@@ -179,6 +179,7 @@
    @PostMapping("pageoperlog")
    public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO) {
        sysOperLogVO.setCommunityId(0l);
        sysOperLogVO.setAreaCode(this.getAreaCode());
        return userService.pageOperLog(sysOperLogVO);
    }

@@ -219,6 +220,7 @@
    @ApiOperation(value = "分页查询用户意见反馈", response = SysUserFeedbackVO.class)
    @PostMapping("pagefeedback")
    public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO) {
        pageFeedBackDTO.setAreaCode(this.getAreaCode());
        return userService.pageFeedback(pageFeedBackDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/PageConvenientMerchantDTO.java

@@ -42,4 +42,6 @@
    @NotNull(message = "分页参数不能为空")
    @Min(value = 1)
    private Long pageSize;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java

@@ -35,4 +35,6 @@
    private String name;
    @ApiModelProperty(value = "手机号", example = "")
    private String phone;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java

@@ -78,4 +78,6 @@

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    private String areaCode;
}

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

@@ -39,6 +39,7 @@
        SELECT ccm.*, su.account, su.status AS accountStatus, GROUP_CONCAT(ccss.service_name) AS serviceScope
        FROM  com_convenient_merchants ccm
        LEFT JOIN sys_user su ON ccm.user_id = su.user_id
        LEFT JOIN com_act ca on ccm.community_id = ca.community_id
        LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
        WHERE ccm.is_del = 0
        <if test="pageConvenientMerchantDTO.serviceId != null and pageConvenientMerchantDTO.serviceId != 0">
@@ -50,6 +51,9 @@
        <if test="pageConvenientMerchantDTO.communityId != null and pageConvenientMerchantDTO.communityId != 0">
            AND ccm.community_id = ${pageConvenientMerchantDTO.communityId}
        </if>
        <if test="pageConvenientMerchantDTO.areaCode != null and pageConvenientMerchantDTO.areaCode != ''">
            AND ca.area_code = ${pageConvenientMerchantDTO.areaCode}
        </if>
        <if test="pageConvenientMerchantDTO.businessStatus != null">
            AND ccm.business_status = #{pageConvenientMerchantDTO.businessStatus}
        </if>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java

@@ -108,4 +108,6 @@
     * 操作账户
     */
    private String account;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -367,6 +367,7 @@
            if (comActVO != null) {
                loginUserInfoVO.setCommunityName(comActVO.getName());
                loginUserInfoVO.setComActVO(comActVO);
                loginUserInfoVO.setAreaCode(comActVO.getAreaCode());
                SysAppConfig sysAppConfig=sysAppConfigDao.selectOne(new QueryWrapper<SysAppConfig>().lambda().eq(SysAppConfig::getAreaCode,comActVO.getAreaCode()));
                if(sysAppConfig!=null){
                    loginUserInfoVO.setAppId(sysAppConfig.getAppId());

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysOperLogDAO.xml

@@ -28,7 +28,7 @@


    <select id="pageOperLog" resultType="com.panzhihua.common.model.vos.user.SysOperLogVO">
select * from sys_oper_log where community_id = #{sysOperLogVO.communityId} order by oper_time desc
select * from sys_oper_log where community_id = #{sysOperLogVO.communityId} <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
    </select>



 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserFeedbackDAO.xml

@@ -58,6 +58,9 @@
            <if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != &quot;&quot;'>
                and u.nick_name like concat('%',#{pageFeedBackDTO.nickName},'%')
            </if>
            <if test='pageFeedBackDTO.areaCode != null and pageFeedBackDTO.areaCode.trim() != &quot;&quot;'>
                and c.area_code = #{pageFeedBackDTO.areaCode}
            </if>
        </where>
        order by f.create_at desc