Merge branch 'cc_2024_1104_fix_addOperationLog' into 'master'

cc_2024_1104_fix_addOperationLog See merge request hangzhou/java/custom_zxjp!22
2024-11-04 11:10:40 +00:00
parent bfcae3f27f 66736b23c7
commit 2e0a655ad2
1 changed files with 1 additions and 0 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
@@ -64,6 +64,7 @@ public class OperationLogServiceImpl implements OperationLogService {
        calendar.add(Calendar.SECOND, 1);
        Date date = calendar.getTime();
        if(CollectionUtils.isEmpty(operationUserList)){
+            operationUserList=new ArrayList<>();
            operationUserList.addAll(enterpriseUserDAO.getUserInfoByUserIds(enterpriseUserRoleDao.selectUserIdsByRole(Role.MASTER))) ;
        }
        for (EnterpriseUserDO operationUser : operationUserList) {