|
@@ -142,8 +142,6 @@ public class NewsApiController {
|
|
|
|
|
|
try {
|
|
try {
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
Map<String,Object> searchParams = new HashMap<>();
|
|
|
|
|
|
List<Sort> sortList = new ArrayList<>();
|
|
List<Sort> sortList = new ArrayList<>();
|
|
@@ -184,9 +182,12 @@ public class NewsApiController {
|
|
throw new Exception("未找到内容");
|
|
throw new Exception("未找到内容");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ PersonInfo personInfo = personInfoService.get(shareWorksInfo.getCreateBy());
|
|
|
|
+
|
|
shareWorksInfo.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("共享用工类型",shareWorksInfo.getType()));
|
|
shareWorksInfo.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("共享用工类型",shareWorksInfo.getType()));
|
|
|
|
|
|
returnMap.put("shareWorksInfo",shareWorksInfo);
|
|
returnMap.put("shareWorksInfo",shareWorksInfo);
|
|
|
|
+ returnMap.put("personInfo",personInfo);
|
|
|
|
|
|
messageResult.setResult(true);
|
|
messageResult.setResult(true);
|
|
messageResult.setData(returnMap);
|
|
messageResult.setData(returnMap);
|
|
@@ -257,6 +258,9 @@ public class NewsApiController {
|
|
|
|
|
|
returnMap.put("trainingInfo",trainingInfo);
|
|
returnMap.put("trainingInfo",trainingInfo);
|
|
|
|
|
|
|
|
+ PersonInfo personInfo = personInfoService.get(enterpriseInfo.getCreateBy());
|
|
|
|
+ returnMap.put("personInfo",personInfo);
|
|
|
|
+
|
|
messageResult.setResult(true);
|
|
messageResult.setResult(true);
|
|
messageResult.setData(returnMap);
|
|
messageResult.setData(returnMap);
|
|
} catch (Exception ex) {
|
|
} catch (Exception ex) {
|