diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java index 148de76c05340d0e24e34310ad85b98ab3df1079..ca80900ff2a5d58481029eb12d1c5c84d4483eae 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java @@ -158,6 +158,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao, } catch (Exception e) { throw new AppException("瀵嗙爜杞崲寮傚父锛�", e); } + sysUser.setUpdateTime(new Date()); dao.update(sysUser); this.putCache(loginName, sysUser); @@ -218,7 +219,8 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao, boolean bool = com.mortals.framework.util.FileUtil.write(filePath, FileUtil.readBytes(file), true, true); if (bool) { workmanEntity.setPhotoPath(newName); - workmanService.update(workmanEntity); + workmanEntity.setUpdateTime(new Date()); + workmanService.getDao().update(workmanEntity); } } catch (IOException e) { log.error("鍐欏叆璇佺収寮傚父", e); @@ -254,7 +256,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao, entity.setId(workmanEntity.getId()); entity.setDeleted(YesNoEnum.NO.getValue()); entity.setUpdateUserId(this.getContextUserId(context)); - entity.setCreateTime(new Date()); + entity.setUpdateTime(new Date()); WorkmanEntity update = this.update(entity, context); if (update != null) { successNum++; diff --git a/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java b/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java index d24c3daa65ffa1e5a23bc0646095036bfd94d940..38608c675c15d6fa519e37097e92b3120f266c63 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java @@ -111,10 +111,10 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(), ip); workmanEntity.setLastLoginAddress(ip); workmanEntity.setLastLoginTime(new Date()); - if(query.getWindowId()!=null) { + if (query.getWindowId() != null) { workmanEntity.setWindowId(query.getWindowId()); WindowEntity windowEntity = windowService.get(query.getWindowId()); - if(windowEntity!=null){ + if (windowEntity != null) { workmanEntity.setWindowName(windowEntity.getName()); } } @@ -141,7 +141,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman JSONObject ret = new JSONObject(); try { log.info("filePath:" + query.getFilePath()); - Rest<Void> rest = this.service.doImportPic(query.getFilePath()); + this.service.doImportPic(query.getFilePath()); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); recordSysLog(request, getCurUser(), "瑙f瀽宸ヤ綔浜哄憳鍥剧墖鎴愬姛!"); return ret.toJSONString(); @@ -170,7 +170,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman } else { throw new AppException("璐︽埛瀵嗙爜淇敼澶辫触锛�"); } - + recordSysLog(request, getCurUser(), "宸ヤ綔浜哄憳鏇存柊瀵嗙爜鎴愬姛! workman:"+query.getLoginName()); } catch (Exception e) { ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_MSG, super.convertException(e)); @@ -245,7 +245,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman } if (!ObjectUtils.isEmpty(workmanEntity.getDeptName())) { DeptEntity dept = deptService.selectOne(new DeptQuery().name(workmanEntity.getDeptName()).siteId(siteEntity.getId())); - if(!ObjectUtils.isEmpty(dept)){ + if (!ObjectUtils.isEmpty(dept)) { workmanEntity.setDeptId(dept.getId()); workmanEntity.setDeptName(dept.getName()); }