diff --git a/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java index f332175..9e1695e 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/ex/UnitStandardDto.java @@ -14,14 +14,26 @@ import javax.validation.constraints.NotNull; @ApiModel("部门普通考核项列表") public class UnitStandardDto { - @NotNull(message = "用户id不能为空") + @NotNull(message = "用户不能为空") @ApiModelProperty(value = "用户id",required = true) private String userId; + @NotNull(message = "部门不能为空") + @ApiModelProperty(value = "部门id",required = true) + private String performId; + @NotNull(message = "考核不能为空") @ApiModelProperty(value = "考核id",required = true) private String examineId; + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public String getExamineId() { return examineId; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java b/inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java index 087eac9..8273a87 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java +++ b/inventory-dao/src/main/java/com/rzyc/model/user/SysUser.java @@ -199,6 +199,9 @@ public class SysUser implements Serializable { @ApiModelProperty("职务id") private String listperformid; + @ApiModelProperty("部门id") + private String performId; + /** * 职务名 */ @@ -256,6 +259,14 @@ public class SysUser implements Serializable { private static final long serialVersionUID = 1L; + public String getPerformId() { + return performId; + } + + public void setPerformId(String performId) { + this.performId = performId; + } + public String getUnitPath() { return unitPath; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 3d719d4..4a84ef1 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -1896,6 +1896,7 @@ public class BaseController { if(StringUtils.isNotBlank(sysUser.getSystitle())){ ListPerform listPerform = listPerformMapper.selectByPrimaryKey(sysUser.getSystitle()); if(null != listPerform){ + sysUser.setPerformId(listPerform.getSupclassid()); String titleName = listPerform.getPerformclassname(); if(StringUtils.isNotBlank(sysUser.getSysunitorentname())){ titleName = titleName.replace(sysUser.getSysunitorentname(),""); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java index 8221de2..e7b549d 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ExamineController.java @@ -508,7 +508,7 @@ public class ExamineController extends BaseController{ MultiResult result = new MultiResult<>(); //部门id - String unitId = getUnitId(unitStandardDto.getUserId()); + String unitId = unitStandardDto.getPerformId(); //部门信息 ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); if(null != listPerform && null != listPerform.getExamineState()){ @@ -563,7 +563,7 @@ public class ExamineController extends BaseController{ MultiResult result = new MultiResult<>(); //部门id - String unitId = getUnitId(unitStandardDto.getUserId()); + String unitId = unitStandardDto.getPerformId(); //部门信息 ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); if(null != listPerform && null != listPerform.getExamineState()){ @@ -590,7 +590,7 @@ public class ExamineController extends BaseController{ public MultiResult unitStandardList(@Valid UnitStandardDto unitStandardDto)throws Exception{ MultiResult result = new MultiResult<>(); //部门id - String unitId = getUnitId(unitStandardDto.getUserId()); + String unitId = unitStandardDto.getPerformId(); //部门信息 ListPerform listPerform = listPerformMapper.selectByPrimaryKey(unitId); if(null != listPerform && null != listPerform.getExamineState()){