|
@@ -248,13 +248,15 @@ public class MessageNoticeApiController {
|
|
|
|
|
|
User createUser = userService.get(mc.getCreateBy());
|
|
|
JobUser createJobUser = jobUserService.get(mc.getCreateBy());
|
|
|
- if(createJobUser != null) {
|
|
|
+ String companyId = "";
|
|
|
+ if(createUser != null) {
|
|
|
mc.setCreateByN(createUser.getRealName());
|
|
|
+ companyId = createUser.getCompanyId();
|
|
|
} else if (createJobUser != null) {
|
|
|
mc.setCreateByN(createJobUser.getRealName());
|
|
|
}
|
|
|
|
|
|
- Company company = companyService.get(createUser.getCompanyId());
|
|
|
+ Company company = companyService.get(companyId);
|
|
|
if(company != null){
|
|
|
String scaleName = dataDictionaryService.getName(company.getScale());
|
|
|
company.setScaleName(scaleName);
|