仁和区bug修改

101captain

2022-01-20 31713f31b7c54b8fdca1027d65a3df9884ff2448

仁和区bug修改

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

@@ -310,6 +310,7 @@
    @PostMapping("/merchant/add")
    public R addMerchant(@RequestBody @Validated(AddGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
        convenientMerchantDTO.setCreatedBy(this.getUserId());
        convenientMerchantDTO.setAreaCode(this.getAreaCode());
        return communityService.addMerchant(convenientMerchantDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -114,7 +114,6 @@
    private String contactName;

    @ApiModelProperty("联系人电话")
    @NotBlank(groups = AddGroup.class, message = "联系人电话不可为空")
    private String contactPhone;

    @ApiModelProperty("是否签到 1 是 0否")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -4970,7 +4970,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists(String areaCode);
    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);

    /**
     * 综治app-小区列表

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyHelpApi.java

@@ -42,6 +42,7 @@
    @ApiOperation(value = "分页查询所有数据",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.propertyService.comPropertyHelpSelectAll(commonPage);
    }


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

@@ -2317,7 +2317,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    public R getWestCommunityLists(String areaCode) {
    public R getWestCommunityLists(@RequestParam("areaCode")String areaCode) {
        return comActService.getWestCommunityLists(areaCode);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java

@@ -92,7 +92,7 @@
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);

    @Select("select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null'> and area_code = #{areaCode} </if> ")
    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null'> and area_code = #{areaCode} </if> </script>")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);

    @Select("select account,plaintext_password as password from com_act where community_id = ${communityId}")

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

@@ -111,7 +111,7 @@
            List<ComMngCarDO> existList = comMngCarDAO.selectList(
                new QueryWrapper<ComMngCarDO>().lambda().eq(ComMngCarDO::getPlateNum, comMngCarSaveDTO.getPlateNum()));
            if (!existList.isEmpty()) {
                return R.ok("车辆已存在");
                return R.fail("车辆已存在");
            }
        }
        ComMngVillageDO comMngVillageDO = comMngVillageDAO.selectById(comMngCarSaveDTO.getAreaId());

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

@@ -117,7 +117,7 @@
        queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
        IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
        if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
            return R.fail("角色列表为空");
            return R.ok("角色列表为空");
        }
        return R.ok(sysRoleDOIPage);
    }