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
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;