无关风月
2025-01-16 d1cab4b2f2690d1331f12f0d9de78bbbf926f390
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -209,7 +209,7 @@
    @ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
    public R<Shop> getDetailById(@RequestParam("id") Integer id){
        Shop shop = shopService.getById(id);
        if (shop.getPid()==0){
        if (null != shop.getPid() && shop.getPid()==0){
            shop.setPid(null);
        }
        return R.ok(shop);
@@ -504,7 +504,7 @@
            List<UserShop> data = userShopClient.getUserShop(userShop).getData();
            SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
            String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
            userData.setPassword(SecurityUtils.encryptPassword(s));
            userData.setPassword(s);
            sysUserClient.resetPassword(userData);
        }
        return R.ok();