forked from integrated_whb/integrated_whb
隐患信息查看异常修复
parent
141ada59bc
commit
a95b098338
|
@ -1526,21 +1526,8 @@ public class AppHiddenController extends BaseController {
|
||||||
String errInfo = "success";
|
String errInfo = "success";
|
||||||
PageData pd = new PageData();
|
PageData pd = new PageData();
|
||||||
pd = this.getPageData();
|
pd = this.getPageData();
|
||||||
|
|
||||||
if(StringUtils.isNotEmpty(pd.getString("OPERATION_TYPE")) || StringUtils.equals(pd.getString("OPERATION_TYPE"), "1")) {
|
|
||||||
pd.put("RECORDITEM_ID", pd.getString("HIDDEN_ID"));
|
|
||||||
PageData pageData = customHiddenService.findByRecorditemId(pd);
|
|
||||||
PageData pd2 = new PageData();
|
|
||||||
pd2.put("FOREIGN_KEY", pageData.getString("HIDDEN_ID"));
|
|
||||||
pd2.put("TYPE", 3);
|
|
||||||
List<PageData> hImgs = imgFilesService.listAll(pd2);// 隐患图片
|
|
||||||
map.put("hImgs", hImgs);
|
|
||||||
map.put("pd", pageData);
|
|
||||||
map.put("result", errInfo);
|
|
||||||
}else{
|
|
||||||
pd = hiddenService.findById(pd); // 根据ID读取
|
pd = hiddenService.findById(pd); // 根据ID读取
|
||||||
|
if (pd.getString("CONFIRM_USER") == null) {
|
||||||
if (StringUtils.isEmpty(pd.getString("CONFIRM_USER"))) {
|
|
||||||
pd.put("CONFIRM_USER", "");
|
pd.put("CONFIRM_USER", "");
|
||||||
}
|
}
|
||||||
if (pd.getString("CONFIRM_USER") != null || pd.getString("CONFIRM_USER").equals("undefined")) {
|
if (pd.getString("CONFIRM_USER") != null || pd.getString("CONFIRM_USER").equals("undefined")) {
|
||||||
|
@ -1615,7 +1602,6 @@ public class AppHiddenController extends BaseController {
|
||||||
map.put("checkList", checkList);
|
map.put("checkList", checkList);
|
||||||
map.put("repulsecause", repulsecause);
|
map.put("repulsecause", repulsecause);
|
||||||
map.put("result", errInfo);
|
map.put("result", errInfo);
|
||||||
}
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue