shiyang / regional-platform

Download as
Browse Code ยป

Commit 56b6efbb6860dbe18a8019bc4cf82d84e15e7ba6

Authored by hujiaqi
2 parents 72c114adf7 97222bfb46
Exists in master and in 1 other branch 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 @ 56b6efb
... ... @@ -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/ResidentsArchiveFacade.java View file @ 56b6efb
... ... @@ -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());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 56b6efb
... ... @@ -930,7 +930,7 @@
930 930 setWeight(antExChuModel.getWeight());
931 931 setYqWeight(antExChuModel.getYqWeight());
932 932 setBaricIndex(antExChuModel.getBaricIndex());
933   - setHighrisk(JsonUtil.toList(antExChuModel.getHighrisk(), List.class));
  933 +// setHighrisk(JsonUtil.toList(antExChuModel.getHighrisk(), List.class));
934 934 setBg(antExChuModel.getBg());
935 935 try {
936 936 setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(), Map.class));