bug修改

101captain

2022-07-28 e89cf59f458b9d818d1a00ff1bb267b5db4156d1

bug修改

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

@@ -9933,7 +9933,7 @@
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
                                       @RequestParam(value = "unitId",required = false) Long unitId);
                                       @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
    /**
     * 批量删除活动
     * @param ids

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java

@@ -41,7 +41,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridApp(account, password);
        R r = tokenService.loginGridApp(account, password,this.getAppId());
        if (R.isOk(r)) {
            LoginReturnsVO returnsVO =
                JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginReturnsVO.class);

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/LoginApi.java

@@ -40,7 +40,7 @@
        if (empty || empty1) {
            return R.fail("账户密码不能为空");
        }
        R r = tokenService.loginGridBackstage(account, password);
        R r = tokenService.loginGridBackstage(account, password,this.getAppId());
        return r;
    }


 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/ConvenientApi.java

@@ -115,7 +115,7 @@
                        JSONObject.parseObject(JSONObject.toJSONString(merchant.getData()), ConvenientMerchantVO.class);
                Boolean accountValid = merchantVO.getAccountStatus() == 1;
                if (accountValid) {
                    R result = tokenService.loginMerchantBackStage(account, loginBody.getPassword());
                    R result = tokenService.loginMerchantBackStage(account, loginBody.getPassword(),this.getAppId());
                    return result;
                } else {
                    return R.fail("账号被禁用");

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java

@@ -63,7 +63,7 @@
                    JSONObject.parseObject(JSONObject.toJSONString(storeR.getData()), ShopStoreVO.class);
                Boolean accountValid = shopStoreVO.getStatus() == 1;
                if (accountValid) {
                    R r = tokenService.loginShopBackStage(account, password);
                    R r = tokenService.loginShopBackStage(account, password,this.getAppId());
                    return r;
                } else {
                    return R.fail("账号被禁用");

 springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/MicroCommercialStreetApi.java

@@ -98,7 +98,7 @@
        R r = userService.getMcsUserByOpenId(openid);
        if (R.isOk(r) && nonNull(r.getData())) {
            McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
            return tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
            return tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(),this.getAppId());
        }
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setOpenId(openid);
@@ -132,7 +132,7 @@
            McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
            isValid = loginUserInfoVO.getStatus() == 1;
            if (isValid) {
                R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
                R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(),this.getAppId());
                return result;
            } else {
                return R.fail("账号被禁用");
@@ -167,7 +167,7 @@
                            throw new ServiceException("登录错误超过限制,请五分钟后重试");
                        }
                    }
                    R result = tokenService.loginMcsUser(account, password);
                    R result = tokenService.loginMcsUser(account, password,this.getAppId());
                    return result;
                } else {
                    return R.fail("账号被禁用");
@@ -200,7 +200,7 @@
                McsLoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), McsLoginUserInfoVO.class);
                isValid = loginUserInfoVO.getStatus() == 1;
                if (isValid) {
                    R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword());
                    R result = tokenService.loginMcsUser(loginUserInfoVO.getAccount(), loginUserInfoVO.getPlaintextPassword(),this.getAppId());
                    return result;
                } else {
                    return R.fail("账号被禁用");