diff --git a/attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue index 1ae3ad9099bc316453c0ebd76dc2e25f32edbc5c..acc166d3b0ccb3a761a746da532e7f7cfbf3f4f1 100644 --- a/attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue @@ -109,17 +109,17 @@ > </el-switch> </div> - </div> - <Field - label="鎵€灞為儴闂�" - prop="deptId" - v-model="form.deptId" - :enumData="dict.deptId" - type="select" - placeholder="璇烽€夋嫨鎵€灞為儴闂�" - /> + <Field + label="鎵€灞為儴闂�" + prop="deptId" + v-model="form.deptId" + :enumData="dict.deptId" + type="select" + placeholder="璇烽€夋嫨鎵€灞為儴闂�" + /> + </div> <form-buttons @submit="submitForm" noCancelBtn diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java index 3728c0094747238e2ade8b884c4766daeb3047c8..56212bad95171abefe7f6595712f28b7a600c42e 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java @@ -113,14 +113,31 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta // return "1000"+data.getWorkNum(); } + @Override + protected void updateBefore(StaffEntity entity, Context context) throws AppException { + super.updateBefore(entity, context); + if(!ObjectUtils.isEmpty(entity.getDeptId())){ + DeptEntity deptEntity = deptService.get(entity.getDeptId()); + entity.setDeptName(deptEntity==null?"":deptEntity.getDeptName()); + } + } + @Override protected void saveBefore(StaffEntity entity, Context context) throws AppException { int count = this.count(new StaffQuery().workNum(entity.getWorkNum()), context); if (count > 0) { throw new AppException("宸ュ彿閲嶅锛佸伐鍙�:" + entity.getWorkNum()); } + + if(!ObjectUtils.isEmpty(entity.getDeptId())){ + DeptEntity deptEntity = deptService.get(entity.getDeptId()); + entity.setDeptName(deptEntity==null?"":deptEntity.getDeptName()); + } + } + + @Override public StaffInfoVo queryAll(Context context) { StaffInfoVo staffInfoVo = new StaffInfoVo();