Commit b4406f41abc15aaa67a59626498b0bd74519c127

Authored by wangbo
1 parent 643059b58f

update

Showing 1 changed file with 4 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ b4406f4
... ... @@ -26,9 +26,7 @@
26 26 import org.springframework.data.mongodb.core.query.Query;
27 27 import org.springframework.data.mongodb.core.query.Update;
28 28 import org.springframework.stereotype.Service;
29   -import org.springframework.web.bind.annotation.RequestBody;
30 29  
31   -import javax.validation.Valid;
32 30 import java.util.*;
33 31  
34 32 @Service
... ... @@ -58,6 +56,7 @@
58 56 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
59 57 }
60 58 temporaryUser.setCreated(new Date());
  59 + temporaryUser.setModified(new Date());
61 60 List<String> riskLevelIdList = new ArrayList<>();
62 61 if (CollectionUtils.isNotEmpty(temporaryUser.getRiskFactorId())) {
63 62 List<String> riskFactor = temporaryUser.getRiskFactorId();
... ... @@ -87,8 +86,8 @@
87 86 public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
88 87 boolean flag = false;
89 88 List<String> hospital = groupsFacade.findGroupHospital(userId, false);
90   - Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
91   - Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").in(hospital);
  89 + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  90 + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
92 91 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
93 92 pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
94 93 flag = true;
... ... @@ -208,7 +207,7 @@
208 207 requestMap.put("otherRisk", bloodModel.getOtherRisk());
209 208 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
210 209 }
211   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
  210 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");
212 211 }
213 212 }