From f96ade1a353653871f6ecc38e2056f836f2dfe5e Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 12 三月 2024 09:14:18 +0800 Subject: [PATCH] 111 --- server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 10 +++++----- server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java index 5b28bd9..f79a210 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java @@ -214,11 +214,11 @@ update.setId(model.getId()); settleClaimsMapper.updateById(update); - Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK; - String info =applyLogType.getInfo(); - info = info.replace("${param}", param.getCheckInfo()); - SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update)); - settleClaimsLogMapper.insert(log); +// Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK; +// String info =applyLogType.getInfo(); +// info = info.replace("${param}", param.getCheckInfo()); +// SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update)); +// settleClaimsLogMapper.insert(log); return 1; } diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java index b1aaf13..3f3a8e3 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java @@ -332,7 +332,10 @@ queryWrapper.selectAll(Solutions.class); queryWrapper.selectAs(Insurance::getName,Solutions::getInsuranceName); queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId); - + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + if(user.getType().equals(Constants.ONE)){ + queryWrapper.exists(("select 1 from company_solution b where b.isdeleted=0 and b.company_id="+user.getCompanyId()+" and b.SOLUTION_BASE_ID = t.id")); + } if (pageWrap.getModel().getId() != null) { queryWrapper.eq(Solutions::getId, pageWrap.getModel().getId()); } -- Gitblit v1.9.3