From 32ceaed0b09f226642170223d573c0dce7c3ac9d Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Mon, 18 Sep 2023 14:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/ResultCommon.java | 4 ++-- .../LawsWorkingGroupUserController.java | 13 ++++++++++--- .../main/resources/i18n/messages.properties | 11 +++++++++-- .../resources/i18n/messages_en.properties | 18 +++++++++++++++--- .../resources/i18n/messages_zh.properties | 19 ++++++++++++++++--- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 7aced8ad..dbf69392 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -24,7 +24,7 @@ public class ResultCommon { public static final String CANNOT_DUPLICATE_FAVORITES = "cannot.duplicate.favorites"; // 不能重复收藏 public static final String PLEASE_SELECT_DATA = "please.select.data"; // 请选择数据 public static final String NO_CORRESPONDING_DATA_FOUND = "no.corresponding.data.found"; // 未找到对应数据 - public static final String THE_TOPLEVEL_GROUP_CANNOT_BE_DELETED = "The.toplevel.group.cannot.be.deleted"; // 最高级组别不能删除 + public static final String THE_TOPLEVEL_GROUP_CANNOT_BE_DELETED = "the.toplevel.group.cannot.be.deleted"; // 最高级组别不能删除 public static final String PLEASE_SELECT_PERSONNEL_AND_WORKGROUP = "please.select.personnel.and.workgroup"; // 请选择人员和工作组 public static final String NUMBER_WORK_NO_ALREADY_EXISTS = "number.work.no.already.exists"; // 工号已存在 public static final String NO_FILES_IMPORTED = "no.files.imported"; // 没有导入文件 @@ -33,7 +33,7 @@ public class ResultCommon { public static final String IMPORT_DATA_CANNOT_BE_EMPTY = "import.data.cannot.be.empty"; // 导入数据不能为空 public static final String HEADER_INCONSISTENT_WITH_TEMPLATE = "header.inconsistent.with.template"; // 表头与模板不一致 public static final String PLEASE_SELECT_A_WORKGROUP_TO_EXPORT = "please.select.a.workgroup.for.export"; // 请选择工作组进行导出 - public static final String THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT = "the.job.number.cannot.be.empty.EXPORT"; // 第{0}行,工号不能为空 + public static final String THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT = "the.job.number.cannot.be.empty.export"; // 第{0}行,工号不能为空 public static final String JOB_NUMBER_DOES_NOT_EXIST_EXPORT = "job.number.does.not.exist.export"; // 第{0}行,工号不存在 public static final String DUPLICATE_JOB_NUMBER_EXPORT = "duplicate.job.number.export"; // 第{0}行,工号重复 diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index e156a434..f65a0c58 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -105,7 +105,7 @@ public class LawsWorkingGroupUserController extends JeroController list = lawsWorkingGroupUserService.list(); + List list = lawsWorkingGroupUserService.list(wrapper); if (list.size() > 0){ String workNo; List collect = list.stream().map(LawsWorkingGroupUser::getUserId).distinct().collect(Collectors.toList()); @@ -119,8 +119,15 @@ public class LawsWorkingGroupUserController extends JeroController groupUsers = new ArrayList<>(); + for (String id : asList) { + LawsWorkingGroupUser workingGroupUser = new LawsWorkingGroupUser(); + workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId()); + workingGroupUser.setUserId(id); + workingGroupUser.setDelFlag("0"); + groupUsers.add(workingGroupUser); + } + lawsWorkingGroupUserService.saveBatch(groupUsers); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 537d12ec..29857f89 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -17,14 +17,21 @@ message.empty.standard.name=The standard name cannot be empty successfully.cleared=successfully cleared successfully.deleted.in.bulk=successfully deleted in bulk cannot.duplicate.favorites=cannot duplicate favorites +please.select.data=please select data no.corresponding.data.found=no corresponding data found -The.toplevel.group.cannot.be.deleted=The toplevel group cannot be deleted +the.toplevel.group.cannot.be.deleted=the toplevel group cannot be deleted +please.select.personnel.and.workgroup=please select personnel and workgroup +work.no.already.exists=work no already exists +number.work.no.already.exists=number work no already exists no.files.imported=number {0} already exists Please.select.a.workgroup.to.import=Please select a workgroup to import please.use.a.file.with.the.suffix.xlsx=please use a file with the suffix xlsx import.data.cannot.be.empty=import data cannot be empty -number.workNo.already.exists=number workNo already exists header.inconsistent.with.template=header inconsistent with template +please.select.a.workgroup.for.export=please select a workgroup for export +the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty +job.number.does.not.exist.export=Line {0},job number does not exist +duplicate.job.number.export=Line {0},duplicate job number no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 13a02733..e094a21a 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -17,12 +17,24 @@ es.rmr.setQuality.overTen=Please select up to 10 successfully.cleared=successfully cleared successfully.deleted.in.bulk=successfully deleted in bulk cannot.duplicate.favorites=cannot duplicate favorites +please.select.data=please select data no.corresponding.data.found=no corresponding data found -The.toplevel.group.cannot.be.deleted=The toplevel group cannot be deleted -number.workNo.already.exists=number {0} already exists +the.toplevel.group.cannot.be.deleted=the toplevel group cannot be deleted +please.select.personnel.and.workgroup=please select personnel and workgroup +work.no.already.exists=work no already exists +number.work.no.already.exists=number {0} already exists +import.data.cannot.be.empty=import data cannot be empty +no.files.imported=no files imported +Please.select.a.workgroup.to.import=Please select a workgroup to import +please.use.a.file.with.the.suffix.xlsx=please use a file with the suffix xlsx +header.inconsistent.with.template=header inconsistent with template +please.select.a.workgroup.for.export=please select a workgroup for export +the.job.number.cannot.be.empty.export=Line {0},job number cannot be empty +job.number.does.not.exist.export=Line {0},job number does not exist +duplicate.job.number.export=Line {0},duplicate job number no.corresponding.record.found=No corresponding record found parameters.cannot.be.null=Parameters cannot be null root.node.cannot.be.edited=Root node cannot be edited -horizontal.transgression=Horizontal overstepping of authority \ No newline at end of file +horizontal.transgression=Horizontal overstepping of authority 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 2b0d5683..891a04d0 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -17,11 +17,24 @@ message.empty.standard.name=\u6807\u51C6\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A successfully.cleared=\u6E05\u9664\u6210\u529F successfully.deleted.in.bulk=\u6279\u91CF\u5220\u9664\u6210\u529F cannot.duplicate.favorites=\u4E0D\u80FD\u91CD\u590D\u6536\u85CF +please.select.data=\u8BF7\u9009\u62E9\u6570\u636E no.corresponding.data.found=\u672A\u627E\u5230\u5BF9\u5E94\u6570\u636E -The.toplevel.group.cannot.be.deleted=\u6700\u9AD8\u7EA7\u7EC4\u522B\u4E0D\u80FD\u5220\u9664 -number.workNo.already.exists=\u5DE5\u53F7 {0} \u5DF2\u5B58\u5728 +the.toplevel.group.cannot.be.deleted=\u6700\u9AD8\u7EA7\u7EC4\u522B\u4E0D\u80FD\u5220\u9664 +please.select.personnel.and.workgroup=\u8BF7\u9009\u62E9\u4EBA\u5458\u548C\u5DE5\u4F5C\u7EC4 +work.no.already.exists=\u5DE5\u53F7\u5DF2\u5B58\u5728 +number.work.no.already.exists=\u5DE5\u53F7 {0} \u5DF2\u5B58\u5728 +no.files.imported=\u6CA1\u6709\u5BFC\u5165\u6587\u4EF6 +import.data.cannot.be.empty=\u5BFC\u5165\u6570\u636E\u4E0D\u80FD\u4E3A\u7A7A +Please.select.a.workgroup.to.import=\u8BF7\u9009\u62E9\u5DE5\u4F5C\u7EC4\u8FDB\u884C\u5BFC\u5165 +please.use.a.file.with.the.suffix.xlsx=\u8BF7\u4F7F\u7528\u540E\u7F00\u540D\u4E3A.xlsx\u7684\u6587\u4EF6 +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 +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 + no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91 -horizontal.transgression=\u6C34\u5E73\u8D8A\u6743 \ No newline at end of file +horizontal.transgression=\u6C34\u5E73\u8D8A\u6743