修改人区局

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -699,7 +699,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         businessReminderCardLog.setBusinessReminderCardId(businessReminderCard.getId());
         businessReminderCardLog.setUpdateTime(new Date());
         businessReminderCardLog.setSysBusinessHall(byId.getSysBusinessHall());//登陆人营业厅 等待
-        businessReminderCardLog.setSysCompany(null);//登陆人区级 等待
+        businessReminderCardLog.setSysCompany(byId.getCompany());//登陆人区级 等待
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         businessReminderCardLog.setBusinessReminderCreateBy(byId.getCreateBy());
         businessReminderCardLog.setUpdateBy(sysUser.getUsername());
@@ -727,14 +727,19 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                 .eq(BusinessReminderCardLog::getDelFlag, CommonConstant.DEL_FLAG_0)
                 .eq(BusinessReminderCardLog::getBusinessReminderCardId,businessReminderCardId).orderByDesc(BusinessReminderCardLog::getUpdateTime);
 
+        List<SysCompany> sysCompanyList =sysCompanyService.list();
         List<BusinessReminderCardLog> list = businessReminderCardLogService.list(queryWrapper);
-
+        Map<String, SysCompany> collect1 = sysCompanyList.stream()
+                .collect(Collectors.toMap(v -> v.getId(), Function.identity(), (o, n) -> o));
         Map<String, SysBusinessHall> collect = sysBusinessHallService.list().stream()
                 .collect(Collectors.toMap(v -> v.getId(), Function.identity(), (o, n) -> o));
         for (BusinessReminderCardLog businessReminderCardLog : list) {
             if (collect.get(businessReminderCardLog.getSysBusinessHall())!=null){
                 businessReminderCardLog.setSysBusinessHall(collect.get(businessReminderCardLog.getSysBusinessHall()).getName());
             }
+            if (collect1.get(businessReminderCardLog.getSysCompany())!=null){
+                businessReminderCardLog.setSysCompany(collect1.get(businessReminderCardLog.getSysCompany()).getName());
+            }
         }
         return Result.OK(list);
     }