jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7d6a59e9c82f0de46862a10c8b582597130ecbaa

Authored by wangbo
1 parent 9562951a98
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 6 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java View file @ 7d6a59e
... ... @@ -24,7 +24,7 @@
24 24 @ResponseBody
25 25 @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
26 26 @TokenRequired
27   - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
  27 + public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) {
28 28 return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
29 29  
30 30 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ 7d6a59e
... ... @@ -51,8 +51,8 @@
51 51 @Override
52 52 public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, Integer userId) {
53 53 if (null != temporaryUser.getId()) {
54   - temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUser.getId())), temporaryUser);
55 54 temporaryUser.setModified(new Date());
  55 + temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUser.getId())), temporaryUser);
56 56 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
57 57 }
58 58 if (StringUtils.isNotEmpty(temporaryUser.getCardID()) || StringUtils.isNotEmpty(temporaryUser.getPhone())) {
... ... @@ -60,12 +60,10 @@
60 60 criteria = criteria.orOperator(Criteria.where("cardID").is(temporaryUser.getCardID()), Criteria.where("phone").is(temporaryUser.getPhone()));
61 61 TemporaryUserModel temporaryUserModels = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class);
62 62 if (temporaryUserModels != null) {
63   - temporaryUserModels.setModified(new Date());
64   - WriteResult s = mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(temporaryUser.getId())), Update.update("yn", "1"), TemporaryUserModel.class);
65   - if (s.getN() >= 1) {
66   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("");
67   - }
68   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该用户已建档!");
  63 + temporaryUser.setModified(new Date());
  64 + temporaryUser.setYn("1");
  65 + temporaryUserDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(temporaryUserModels.getId())), temporaryUser);
  66 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("完成!");
69 67 }
70 68 }
71 69 temporaryUser.setCreated(new Date());