From 39fc2dc7ca21a8f48c2fb409e1fc93de19430235 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 23 Aug 2024 15:08:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 3 +++ .../sys/controller/LawsWorkingGroupUserController.java | 10 +++++----- .../jero/modules/sys/entity/LawsWorkingGroupUser.java | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 8ff0bcb8..1588bb90 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -213,3 +213,6 @@ INSERT INTO `laws_tag` (`id`, `table_name`, `db_field_name`, `db_field_en_name`, INSERT INTO sys_sms_template (id, template_code, template_name, template_content, template_type, create_by, create_time) VALUES ('1824272435207028738', 'laws_problem_library_answer', '【问答库】新回答', '您好，在 ${standardNumber} ${standardName} 的 ${title} 中有新回答，请前往标准法规管理系统或研发大前台标准法规管理模块问答库进行查看。', '5,4,6', 'admin', '2024-08-16 10:30:16'); INSERT INTO sys_sms_template (id, template_code, template_name, template_content, template_type, create_by, create_time) VALUES ('1824275060971274242', 'laws_problem_library_answer_top', '【问答库】有新的回答被置顶', '您好，在 ${standardNumber} ${standardName} 的 ${title} 中，有新的回答已被置顶，请前往标准法规管理系统或研发大前台标准法规管理模块问答库进行查看。', '4,5,6', 'admin', '2024-08-16 10:40:42'); +-- 2024-08-23 岗位 +ALTER TABLE laws_working_group_user + ADD COLUMN `job` varchar(500) NULL COMMENT '岗位' AFTER `del_flag`; 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 623bce05..f7032e6a 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 @@ -103,13 +103,13 @@ public class LawsWorkingGroupUserController extends JeroController add(@Validated @RequestBody LawsWorkingGroupUser lawsWorkingGroupUser) { + if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())) { + throw new JeroBootException(ResultCommon.PLEASE_SELECT_PERSONNEL_AND_WORKGROUP); + } if (!"1".equals(lawsWorkingGroupUser.getSearchType())) { - if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())) { - throw new JeroBootException(ResultCommon.PLEASE_SELECT_PERSONNEL_AND_WORKGROUP); - } + // 校验是否有权限 + lawsWorkingGroupUserService.checkAuth(lawsWorkingGroupUser.getWorkingGroupId()); } - // 校验是否有权限 - lawsWorkingGroupUserService.checkAuth(lawsWorkingGroupUser.getWorkingGroupId()); String userId = lawsWorkingGroupUser.getUserId(); List asList = Arrays.asList(userId.split(",")); diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java index 9f9d8c5b..f77f2ee9 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java @@ -90,6 +90,10 @@ public class LawsWorkingGroupUser implements Serializable { @Excel(name = "岗位",width = 15) private String userPostName; + @ApiModelProperty(value = "职务") + @Excel(name = "职务",width = 15) + private String job; + @TableField(exist = false) @ApiModelProperty(value = "1领导 2成员") private String searchType;