jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ec4f17ebcd8e3909b3918b90ed369f3916f87a3e

Authored by jiangjiazhi
2 parents f1d59239d5 56b6efbb68
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ ec4f17e
... ... @@ -68,7 +68,7 @@
68 68 HttpServletRequest request) {
69 69 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
70 70 if (addRequest != null && StringUtils.isNotEmpty(addRequest.getId())){
71   - return residentsArchiveFacade.UpdateResidentsArchiveById(addRequest.getId(),addRequest,1);
  71 + return residentsArchiveFacade.UpdateResidentsArchiveById(addRequest.getId(),addRequest,loginState.getId());
72 72 }
73 73 BaseObjectResponse p = residentsArchiveFacade.addResidentsArchiveBy(addRequest, loginState.getId());
74 74 return p;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ec4f17e
... ... @@ -1706,11 +1706,11 @@
1706 1706 }
1707 1707  
1708 1708 // 省
1709   - babyQuery.setProvinceId(request.getProvinceId());
  1709 + babyQuery.setProvinceId(StringUtils.isEmpty(request.getProvinceId())?null:request.getProvinceId());
1710 1710 // 市
1711   - babyQuery.setCityId(request.getCityId());
  1711 + babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId());
1712 1712 // 区/县
1713   - babyQuery.setAreaId(request.getAreaId());
  1713 + babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId());
1714 1714  
1715 1715 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC);
1716 1716  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ ec4f17e
... ... @@ -222,7 +222,7 @@
222 222 try {
223 223 ResidentsArchiveModel model = addRequest.convertToDataModel();
224 224 model.setModified(new Date());
225   - model.setPublishId(String.valueOf(userId));
  225 +// model.setPublishId(String.valueOf(userId));
226 226 Users users = usersService.getUsers(userId);
227 227 if (users!=null && users.getYn()!=YnEnums.NO.getId()){
228 228 model.setPublishName(users.getName());