Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminAgreementController.java

@@ -60,9 +60,8 @@
        THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
        model.addAttribute("objectType", objectType);
        model.addAttribute("item", huiminAgreement);
        model.addAttribute("tHuiminAgreementSettingList", Objects.nonNull(huiminAgreement) ? JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList()) : "");
        //查询运营商列表
        model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq("state", 1)));
        model.addAttribute("operatorList", operatorService.list(new QueryWrapper<TOperator>().eq(Objects.nonNull(operatorId), "id",operatorId).eq("state", 1)));
        model.addAttribute("operatorId", operatorId);
        return PREFIX + "tHuiminAgreement_add.html";
    }
@@ -72,23 +71,19 @@
        tHuiminAgreement.setObjectType(UserExt.getUser().getObjectType());
        String agreementSettings = tHuiminAgreement.getAgreementSettings();
        List<THuiminAgreementSetting> tHuiminAgreementSettings = JSONArray.parseArray(agreementSettings, THuiminAgreementSetting.class);
        tHuiminAgreement.setTHuiminAgreementSettingList(tHuiminAgreementSettings);
        tHuiminAgreement.setSettingList(tHuiminAgreementSettings);
        huiminAgreementClient.insert(tHuiminAgreement);
        return SUCCESS_TIP;
    }
    @RequestMapping(value = "/selectAgreementByOperationId")
    @ResponseBody
    public ResultUtil<String> selectAgreementByOperationId(Integer operatorId) {
        String tHuiminAgreementSettings = "";
    public ResultUtil<THuiminAgreement> selectAgreementByOperationId(Integer operatorId) {
        Integer objectType = UserExt.getUser().getObjectType();
        HuiminAgreementQuery huiminAgreementQuery = new HuiminAgreementQuery();
        huiminAgreementQuery.setOperatorId(operatorId);
        huiminAgreementQuery.setObjectType(Objects.isNull(operatorId) ? 1 : 2);
        huiminAgreementQuery.setObjectType(objectType);
        THuiminAgreement huiminAgreement = huiminAgreementClient.selectByObjectType(huiminAgreementQuery);
        if (Objects.nonNull(huiminAgreement)) {
            //查询协议配置
            tHuiminAgreementSettings = JSONArray.toJSONString(huiminAgreement.getTHuiminAgreementSettingList());
        }
        return ResultUtil.success(tHuiminAgreementSettings);
        return ResultUtil.success(huiminAgreement);
    }
/*
    *//**