From 3813a91563f0a3e570e4ec88d2691db7f003179b Mon Sep 17 00:00:00 2001 From: liaocc Date: Sun, 4 Jan 2026 21:26:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B9=B4=E6=8A=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annual/controller/AnModifyPermitController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java b/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java index aa82eb0..e3622f1 100644 --- a/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java +++ b/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java @@ -1,8 +1,6 @@ package com.chinaweal.aiccs.aiceps.annual.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode; -import com.chinaweal.aiccs.aiccs.market.entity.TSSueInspect; import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit; import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService; import com.chinaweal.aiccs.common.base.controller.BaseController; @@ -55,7 +53,7 @@ public class AnModifyPermitController extends BaseController { AnModifyPermit anModifyPermit = null; anModifyPermit = anModifyPermitService.getById(id); if(anModifyPermit != null){ - anModifyPermitService.updateById(anModifyPermit); + anModifyPermitService.removeById(anModifyPermit); } return RestResult.ok(); @@ -65,7 +63,7 @@ public class AnModifyPermitController extends BaseController { @PostMapping("/update") public RestResult updatePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult) { AssertUtils.isBndingValidit(bindingResult); - anModifyPermitService.save(anModifyPermit); + anModifyPermitService.updateById(anModifyPermit); return RestResult.ok(); } @@ -83,8 +81,9 @@ public class AnModifyPermitController extends BaseController { Map customParamMap = pageRequestDto.getCustomParamMap(); if (customParamMap == null) return; // 统一码 - if (customParamMap.get("uniscid") != null) { - queryWrapper.lambda().eq(AnModifyPermit::getUniscid, customParamMap.get("uniscid")); + String uniscid = StringUtils.tranObject(customParamMap.get("uniscid")); + if (StringUtils.isNotBlank(uniscid)) { + queryWrapper.lambda().eq(AnModifyPermit::getUniscid, uniscid); } }, null); return RestResult.ok(data); From f37f2e9b120f66fd20217170ba6cac4f0ed99788 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Sun, 4 Jan 2026 22:20:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=B9=A6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BA=BA=E6=B0=91=E6=94=BF=E5=BA=9C=E5=AD=97?= =?UTF-8?q?=E7=9C=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TswrittemplateServiceImpl.java | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java index 3be8046..3f8da86 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java @@ -1,9 +1,12 @@ package com.chinaweal.aiccs.aiccs.writs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; +import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSBizRemList; import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService; +import com.chinaweal.aiccs.aiccs.abnormal.service.IGzaiccodeService; import com.chinaweal.aiccs.aiccs.abnormal.service.TSBizRemListService; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalRem; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList; @@ -30,8 +33,10 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -53,6 +58,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl lqw = Wrappers.lambdaQuery(); + //查地市名称 + lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00"); + Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw); + String areaName = gzaiccode.getScountryextcode(); + String addr = ConstantsUtil.getAddr(regionId); String phoneDW = ConstantsUtil.getPhone(regionId); String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY) @@ -163,10 +178,8 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl lqw = Wrappers.lambdaQuery(); + //查地市名称 + lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00"); + Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw); + String areaName = gzaiccode.getScountryextcode(); + String addr = ConstantsUtil.getAddr(regionId); String phoneDW = ConstantsUtil.getPhone(regionId); String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY) @@ -231,9 +251,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl Date: Sun, 4 Jan 2026 23:56:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=9C=E5=93=A5?= =?UTF-8?q?=E5=86=99=E7=9A=84=E6=9D=83=E9=99=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chinaweal/aiccs/org/controller/UserController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java index c89ff86..c846efd 100644 --- a/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java +++ b/src/main/java/com/chinaweal/aiccs/org/controller/UserController.java @@ -655,7 +655,6 @@ public class UserController extends BaseController { @GetMapping("/listUserByPermissionAndOrgIds") public RestResult> listUserByPermissionAndOrgIds(String permission, String orgId, Boolean isArea, HttpServletRequest request) { AICUser loginUser = getLoginUser(request); - orgId = loginUser.getOrgID().substring(0, 4) + "00"; List userList = usersService.findUserByPermissionAndOrgIds(permission, orgId, isArea, loginUser); return RestResult.ok(userList); }