From 9be2cbaf7eb44ae27b35515ad495da6f8f6d896f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 10 Nov 2023 18:09:45 +0800 Subject: [PATCH 1/2] fix: 78304 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企标--导入--稽查内容的整改部门带出回显 --- .../service/impl/LawsCommonServiceImpl.java | 4 ++- .../modules/laws/common/util/ImportUtil.java | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index b6348a8d..bc12f06e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -644,7 +644,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { } // 企标授权部门处理 if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) { - esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); + if (parameterMap.get(FieldCommon.AUTH_DEPT) != null) { + esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); + } } return MessageUtils.getMessage(ResultCommon.OK); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java index 2eeceeef..5494711b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java @@ -437,17 +437,6 @@ public class ImportUtil { } } - // 企标稽查内容文件导入 - if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) { - if (!this.inspectContentFileValid(cellValue, fileMap)) { - log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); - errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); - } else { - // 转为List - // 将转好的值加入Map - parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); - } - } // 树形单选 if (FieldShowTypeEnum.TREE_STRUCTURE_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) { // 根据tag找到dictCode @@ -463,6 +452,19 @@ public class ImportUtil { // 将转好的值加入Map parameterMap.put(tag.getDbFieldName(), cellValue); + + // 企标稽查内容文件导入 + if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) { + if (!this.inspectContentFileValid(cellValue, fileMap)) { + cellValue = null; + log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 "); + errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 "); + } else { + // 转为List + // 将转好的值加入Map + parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap)); + } + } } // 判断实施日期是否大于发布日期15天 if (releaseDate != null && implementationDate != null) { @@ -837,6 +839,7 @@ public class ImportUtil { // 获取第四行前两个单元格的内容 String cellContent1 = getCellContent(row.getCell(0)); String cellContent2 = getCellContent(row.getCell(1)); + String cellContent3 = getCellContent(row.getCell(2)); // 执行valid方法进行校验 if (!valid(cellContent1, cellContent2)) { return false; From 80218cded77e65c98a520cb482130b7d4c8d515a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 10 Nov 2023 18:11:18 +0800 Subject: [PATCH 2/2] fix:78441 --- .../system/controller/SysUserController.java | 13 +++++++------ .../src/main/resources/i18n/messages_zh.properties | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 0b2ef75a..1a0960ec 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -777,9 +777,10 @@ public class SysUserController { */ @PostMapping("/deleteUserRole") @RequiresPermissions("sys:user:sel") - public Result deleteUserRole(@RequestParam(name="roleId") String roleId, - @RequestParam(name="userId",required=true) String userId) { - try { + public Result deleteUserRole(@RequestBody Map map) { + try { + String roleId = map.get("roleId"); + String userId = map.get("userId"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(ROLE_ID, roleId).eq(USER_ID,userId); sysUserRoleService.remove(queryWrapper); @@ -798,10 +799,10 @@ public class SysUserController { */ @PostMapping("/deleteUserRoleBatch") @RequiresPermissions("sys:user:sel") - public Result deleteUserRoleBatch( - @RequestParam(name="roleId") String roleId, - @RequestParam(name="userIds",required=true) String userIds) { + public Result deleteUserRoleBatch(@RequestBody Map map) { try { + String roleId = map.get("roleId"); + String userIds = map.get("userIds"); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(ROLE_ID, roleId).in(USER_ID,Arrays.asList(userIds.split(","))); sysUserRoleService.remove(queryWrapper); diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index b87118d1..fe73aec4 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -35,7 +35,7 @@ please.use.a.file.with.the.suffix.xls=\u8BF7\u4F7F\u7528\u540E\u7F00\u540D\u4E3A header.inconsistent.with.template=\u8868\u5934\u4E0E\u6A21\u677F\u4E0D\u4E00\u81F4 please.select.a.workgroup.for.export=\u8BF7\u9009\u62E9\u5DE5\u4F5C\u7EC4\u8FDB\u884C\u5BFC\u51FA the.job.number.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u4E3A\u7A7A -the.realname.cannot.be.empty.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u80FD\u4E3A\u7A7A +the.real.name.cannot.be.empty.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A job.number.does.not.exist.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u4E0D\u5B58\u5728 duplicate.job.number.export=\u7B2C{0}\u884C,\u5DE5\u53F7\u91CD\u590D cannot.close=\u4E0D\u662F\u5F85\u6574\u6539\u5DF2\u8FC7\u671F\u7684\u6570\u636E\u4E0D\u80FD\u5173\u95ED @@ -64,6 +64,7 @@ you.have.not.data.auth=\u60A8\u6CA1\u6709{0}\u7684\u6570\u636E\u6743\u9650\uFF0C dict.delete.error=\u6807\u7B7E\u5DF2\u88AB\u5F15\u7528\uFF0C\u65E0\u6CD5\u5220\u9664 parameter.not.recognized=\u53C2\u6570\u4E0D\u8BC6\u522B + the.real.name.and.job.number.mismatch.export=\u7B2C{0}\u884C,\u59D3\u540D\u4E0E\u5DE5\u53F7\u4E0D\u5339\u914D tag.delete.error.3=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664 tag.edit.error.1=\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u4FEE\u6539