Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-13 c203b8e2f84a367ef9d73035c58513c7a907fe7f

Merge branch 'local_20221010' into huacheng_test

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

@@ -179,7 +179,7 @@
    @ApiOperation(value = "分页展示操作日志", response = SysOperLogVO.class)
    @PostMapping("pageoperlog")
    public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO) {
        sysOperLogVO.setCommunityId(0l);
//        sysOperLogVO.setCommunityId(0l);
//        sysOperLogVO.setAreaCode(this.getAreaCode());
        return userService.pageOperLog(sysOperLogVO);
    }

 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} <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
        select * from sys_oper_log where 1=1 <if test="sysOperLogVO.communityId != null">and community_id = #{sysOperLogVO.communityId}</if> <if test="sysOperLogVO.areaCode !=null"> and area_code = #{sysOperLogVO.areaCode} </if> order by oper_time desc
    </select>