ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fourthStage' into fourthStage

Browse Source
This commit is contained in:
yjz
2024-08-23 15:23:00 +08:00
parent 0e3db90653 39fc2dc7ca
commit 498a4bf2fd
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/prod/2024-3-18-变更.sql
+3
View File
@@ -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`;
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+5 -5
View File
@@ -103,13 +103,13 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@ApiOperation(value = "内部工作组人员关联表-添加", notes = "内部工作组人员关联表-添加")
@PostMapping(value = "/add")
public Result<T> 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<String> asList = Arrays.asList(userId.split(","));
laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroupUser.java
+4
View File
@@ -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;